|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/11/22]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/06]
|
|
|
#
|
|
|
default: all
|
|
|
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
|
|
|
@@ -153,12 +153,6 @@ ifdef OS_TARGET_DEFAULT
|
|
|
OS_TARGET=$(OS_TARGET_DEFAULT)
|
|
|
endif
|
|
|
endif
|
|
|
-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 CPU_SOURCE
|
|
|
CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
|
|
|
endif
|
|
|
@@ -487,6 +481,7 @@ endif
|
|
|
ifeq ($(FULL_TARGET),mipsel-linux)
|
|
|
override TARGET_PROGRAMS+=importtl
|
|
|
endif
|
|
|
+override INSTALL_FPCPACKAGE=y
|
|
|
ifdef REQUIRE_UNITSDIR
|
|
|
override UNITSDIR+=$(REQUIRE_UNITSDIR)
|
|
|
endif
|
|
|
@@ -1071,25 +1066,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
|
|
|
else
|
|
|
DATESTR=
|
|
|
endif
|
|
|
-ifndef UPXPROG
|
|
|
-ifeq ($(OS_TARGET),go32v2)
|
|
|
-UPXPROG:=1
|
|
|
-endif
|
|
|
-ifeq ($(OS_TARGET),win32)
|
|
|
-UPXPROG:=1
|
|
|
-endif
|
|
|
-ifdef UPXPROG
|
|
|
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
-ifeq ($(UPXPROG),)
|
|
|
-UPXPROG=
|
|
|
-else
|
|
|
-UPXPROG:=$(firstword $(UPXPROG))
|
|
|
-endif
|
|
|
-else
|
|
|
-UPXPROG=
|
|
|
-endif
|
|
|
-endif
|
|
|
-export UPXPROG
|
|
|
ZIPOPT=-9
|
|
|
ZIPEXT=.zip
|
|
|
ifeq ($(USETAR),bz2)
|
|
|
@@ -2050,12 +2026,16 @@ endif
|
|
|
ifndef CROSSBOOTSTRAP
|
|
|
ifneq ($(BINUTILSPREFIX),)
|
|
|
override FPCOPT+=-XP$(BINUTILSPREFIX)
|
|
|
-override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
|
|
|
endif
|
|
|
ifneq ($(BINUTILSPREFIX),)
|
|
|
override FPCOPT+=-Xr$(RLINKPATH)
|
|
|
endif
|
|
|
endif
|
|
|
+ifndef CROSSCOMPILE
|
|
|
+ifneq ($(BINUTILSPREFIX),)
|
|
|
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
|
|
|
+endif
|
|
|
+endif
|
|
|
ifdef UNITDIR
|
|
|
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
|
|
|
endif
|
|
|
@@ -2309,9 +2289,6 @@ endif
|
|
|
fpc_install: all $(INSTALLTARGET)
|
|
|
ifdef INSTALLEXEFILES
|
|
|
$(MKDIR) $(INSTALL_BINDIR)
|
|
|
-ifdef UPXPROG
|
|
|
- -$(UPXPROG) $(INSTALLEXEFILES)
|
|
|
-endif
|
|
|
$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
|
|
|
endif
|
|
|
ifdef INSTALL_CREATEPACKAGEFPC
|
|
|
@@ -2484,7 +2461,6 @@ fpc_baseinfo:
|
|
|
@$(ECHO) Date...... $(DATE)
|
|
|
@$(ECHO) FPCMake... $(FPCMAKE)
|
|
|
@$(ECHO) PPUMove... $(PPUMOVE)
|
|
|
- @$(ECHO) Upx....... $(UPXPROG)
|
|
|
@$(ECHO) Zip....... $(ZIPPROG)
|
|
|
@$(ECHO)
|
|
|
@$(ECHO) == Object info ==
|
joost