|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/01/13]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/01/14]
|
|
|
#
|
|
|
default: all
|
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx
|
|
|
@@ -112,9 +112,10 @@ endif
|
|
|
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
|
|
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
|
|
ifndef FPC_VERSION
|
|
|
-FPC_VERSION:=$(shell $(FPC) -iV)
|
|
|
+FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
|
|
|
+FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
-export FPC FPC_VERSION
|
|
|
+export FPC FPC_VERSION FPC_COMPILERINFO
|
|
|
unexport CHECKDEPEND ALLDEPENDENCIES
|
|
|
ifndef CPU_TARGET
|
|
|
ifdef CPU_TARGET_DEFAULT
|
|
|
@@ -126,33 +127,23 @@ ifdef OS_TARGET_DEFAULT
|
|
|
OS_TARGET=$(OS_TARGET_DEFAULT)
|
|
|
endif
|
|
|
endif
|
|
|
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
|
|
|
-COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
|
|
|
-ifndef CPU_SOURCE
|
|
|
-CPU_SOURCE:=$(word 1,$(COMPILERINFO))
|
|
|
-endif
|
|
|
-ifndef CPU_TARGET
|
|
|
-CPU_TARGET:=$(word 2,$(COMPILERINFO))
|
|
|
-endif
|
|
|
-ifndef OS_SOURCE
|
|
|
-OS_SOURCE:=$(word 3,$(COMPILERINFO))
|
|
|
+ifneq ($(words $(FPC_COMPILERINFO)),5)
|
|
|
+FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
|
|
|
+FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
|
|
|
+FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
|
|
|
+FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
|
|
|
endif
|
|
|
-ifndef OS_TARGET
|
|
|
-OS_TARGET:=$(word 4,$(COMPILERINFO))
|
|
|
-endif
|
|
|
-else
|
|
|
ifndef CPU_SOURCE
|
|
|
-CPU_SOURCE:=$(shell $(FPC) -iSP)
|
|
|
+CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
ifndef CPU_TARGET
|
|
|
-CPU_TARGET:=$(shell $(FPC) -iTP)
|
|
|
+CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
ifndef OS_SOURCE
|
|
|
-OS_SOURCE:=$(shell $(FPC) -iSO)
|
|
|
+OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
ifndef OS_TARGET
|
|
|
-OS_TARGET:=$(shell $(FPC) -iTO)
|
|
|
-endif
|
|
|
+OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
|
|
|
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
|
|
@@ -564,7 +555,7 @@ ZIPSUFFIX=nw
|
|
|
EXEEXT=.nlm
|
|
|
endif
|
|
|
ifeq ($(OS_TARGET),macos)
|
|
|
-PPUEXT=.pput
|
|
|
+PPUEXT=.ppu
|
|
|
ASMEXT=.s
|
|
|
OEXT=.o
|
|
|
SMARTEXT=.sl
|
florian