+ macos and macosx target

* fixed target detection, first we should try the default target
This commit is contained in:
florian 2003-01-13 15:09:16 +00:00
parent cbe0383afe
commit f19b32a165
3 changed files with 340 additions and 329 deletions

File diff suppressed because it is too large Load Diff

View File

@ -176,6 +176,20 @@ unexport CHECKDEPEND ALLDEPENDENCIES
# FPC Target Detection
#####################################################################
# Fall back to default values if needed
ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT
CPU_TARGET=$(CPU_TARGET_DEFAULT)
endif
endif
ifndef OS_TARGET
ifdef OS_TARGET_DEFAULT
OS_TARGET=$(OS_TARGET_DEFAULT)
endif
endif
# For 1.1 and up we can use a single compiler call to retrieve
# all needed information
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
@ -214,21 +228,6 @@ endif
endif
# Fall back to default values if needed
ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT
CPU_TARGET=$(CPU_TARGET_DEFAULT)
endif
endif
ifndef OS_TARGET
ifdef OS_TARGET_DEFAULT
OS_TARGET=$(OS_TARGET_DEFAULT)
endif
endif
# Full name of the target, including CPU and OS
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
@ -822,6 +821,16 @@ ZIPSUFFIX=nw
EXEEXT=.nlm
endif
# MacOS
ifeq ($(OS_TARGET),macos)
PPUEXT=.pput
ASMEXT=.s
OEXT=.o
SMARTEXT=.sl
STATICLIBEXT=.a
EXEEXT=
FPCMADE=fpcmade.mcc
endif
[defaulttools]
#####################################################################

View File

@ -55,7 +55,7 @@ interface
TTarget=(
t_linux,t_go32v2,t_win32,t_os2,t_freebsd,t_beos,t_netbsd,
t_amiga,t_atari, t_sunos, t_qnx, t_netware, t_openbsd,t_wdosx,
t_palmos
t_palmos,t_macos,t_macosx
);
TTargetSet=set of TTarget;
@ -63,13 +63,13 @@ interface
TargetStr : array[TTarget] of string=(
'linux','go32v2','win32','os2','freebsd','beos','netbsd',
'amiga','atari','sunos', 'qnx', 'netware','openbsd','wdosx',
'palmos'
'palmos','macos','macosx'
);
TargetSuffix : array[TTarget] of string=(
'_linux','_go32v2','_win32','_os2','_freebsd','_beos','_netbsd',
'_amiga','_atari','_sunos', '_qnx', '_netware','_openbsd','_wdosx',
'_palmos'
'_palmos','_macos','_macosx'
);
@ -1486,7 +1486,11 @@ implementation
end.
{
$Log$
Revision 1.28 2003-01-13 11:54:02 pierre
Revision 1.29 2003-01-13 15:09:16 florian
+ macos and macosx target
* fixed target detection, first we should try the default target
Revision 1.28 2003/01/13 11:54:02 pierre
+ palmos target added
Revision 1.27 2002/10/07 18:41:02 peter