|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/30]
|
|
|
#
|
|
|
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
|
|
|
@@ -2030,25 +2030,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d)
|
|
|
else
|
|
|
DATESTR=
|
|
|
endif
|
|
|
-ifndef UPXPROG
|
|
|
-ifeq ($(OS_TARGET),go32v2)
|
|
|
-UPXPROG:=1
|
|
|
-endif
|
|
|
-ifeq ($(OS_TARGET),win32)
|
|
|
-UPXPROG:=
|
|
|
-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)
|
|
|
@@ -2074,12 +2055,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
|
|
|
@@ -2350,9 +2335,6 @@ endif
|
|
|
fpc_install: all $(INSTALLTARGET)
|
|
|
ifdef INSTALLEXEFILES
|
|
|
$(MKDIR) $(INSTALL_BINDIR)
|
|
|
-ifdef UPXPROG
|
|
|
- -$(UPXPROG) $(INSTALLEXEFILES)
|
|
|
-endif
|
|
|
$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
|
|
|
endif
|
|
|
ifdef INSTALL_CREATEPACKAGEFPC
|
|
|
@@ -2525,7 +2507,6 @@ fpc_baseinfo:
|
|
|
@$(ECHO) Date...... $(DATE)
|
|
|
@$(ECHO) FPCMake... $(FPCMAKE)
|
|
|
@$(ECHO) PPUMove... $(PPUMOVE)
|
|
|
- @$(ECHO) Upx....... $(UPXPROG)
|
|
|
@$(ECHO) Zip....... $(ZIPPROG)
|
|
|
@$(ECHO)
|
|
|
@$(ECHO) == Object info ==
|
|
|
@@ -2625,3 +2606,9 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) buildrtl$(PPUEXT)
|
|
|
$(COMPILER) $(INC)/macpas.pp $(REDIR)
|
|
|
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT)
|
|
|
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
|
|
+softfpu$(PPUEXT) : ../inc/softfpu.pp system$(PPUEXT)
|
|
|
+ $(COMPILER) ../inc/softfpu.pp
|
|
|
+sfpu128$(PPUEXT) : ../inc/sfpu128.pp system$(PPUEXT)
|
|
|
+ $(COMPILER) ../inc/sfpu128.pp
|
|
|
+sfpux80$(PPUEXT) : ../inc/sfpux80.pp system$(PPUEXT)
|
|
|
+ $(COMPILER) ../inc/sfpux80.pp
|
pierre