|
|
@@ -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/04]
|
|
|
#
|
|
|
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
|
|
|
@@ -1073,25 +1067,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)
|
|
|
@@ -1117,12 +1092,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
|
|
|
@@ -1388,7 +1367,6 @@ fpc_baseinfo:
|
|
|
@$(ECHO) Date...... $(DATE)
|
|
|
@$(ECHO) FPCMake... $(FPCMAKE)
|
|
|
@$(ECHO) PPUMove... $(PPUMOVE)
|
|
|
- @$(ECHO) Upx....... $(UPXPROG)
|
|
|
@$(ECHO) Zip....... $(ZIPPROG)
|
|
|
@$(ECHO)
|
|
|
@$(ECHO) == Object info ==
|
|
|
@@ -9646,11 +9624,11 @@ fcl_debug: fcl-base_debug fcl-xml_debug fcl-fpcunit_debug fcl-db_debug fcl-web_d
|
|
|
fcl_smart: fcl-base_smart fcl-xml_smart fcl-fpcunit_smart fcl-db_smart fcl-web_smart fcl-registry_smart fcl-passrc_smart fcl-image_smart fcl-net_smart fcl-json_smart fcl-res_smart
|
|
|
fcl_release: fcl-base_release fcl-xml_release fcl-fpcunit_release fcl-db_release fcl-web_release fcl-registry_release fcl-passrc_release fcl-image_release fcl-net_release fcl-json_release fcl-res_release
|
|
|
fcl_shared: fcl-base_shared fcl-xml_shared fcl-fpcunit_shared fcl-db_shared fcl-web_shared fcl-registry_shared fcl-passrc_shared fcl-image_shared fcl-net_shared fcl-json_shared fcl-res_shared
|
|
|
-libpng_all: zlib_all
|
|
|
-libpng_debug: zlib_debug
|
|
|
-libpng_smart: zlib_smart
|
|
|
-libpng_release: zlib_release
|
|
|
-libpng_shared: zlib_shared
|
|
|
+libpng_all: zlib_all fpmkunit
|
|
|
+libpng_debug: zlib_debug fpmkunit
|
|
|
+libpng_smart: zlib_smart fpmkunit
|
|
|
+libpng_release: zlib_release fpmkunit
|
|
|
+libpng_shared: zlib_shared fpmkunit
|
|
|
ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),)
|
|
|
cairo_all: x11_all fcl-image_all
|
|
|
cairo_debug: x11_debug fcl-image_debug
|
|
|
@@ -9718,11 +9696,11 @@ imlib_shared: gtk1_shared x11_shared
|
|
|
imlib_smart: gtk1_smart x11_smart
|
|
|
imlib_debug: gtk1_debug x11_debug
|
|
|
imlib_release: gtk1_release x11_release
|
|
|
-ldap_all: hash_all
|
|
|
-ldap_shared: hash_shared
|
|
|
-ldap_smart: hash_smart
|
|
|
-ldap_debug: hash_debug
|
|
|
-ldap_release: hash_release
|
|
|
+ldap_all: hash_all fpmkunit
|
|
|
+ldap_shared: hash_shared fpmkunit
|
|
|
+ldap_smart: hash_smart fpmkunit
|
|
|
+ldap_debug: hash_debug fpmkunit
|
|
|
+ldap_release: hash_release fpmkunit
|
|
|
libpng_all: zlib_all
|
|
|
libpng_shared: zlib_shared
|
|
|
libpng_smart: zlib_smart
|
|
|
@@ -9785,11 +9763,11 @@ ptc_shared: hermes_shared fcl-base_shared
|
|
|
ptc_smart: hermes_smart fcl-base_smart
|
|
|
ptc_debug: hermes_debug fcl-base_debug
|
|
|
ptc_release: hermes_release fcl-base_release
|
|
|
-librsvg_all: gtk2_all
|
|
|
-librsvg_shared: gtk2_shared
|
|
|
-librsvg_smart: gtk2_smart
|
|
|
-librsvg_debug: gtk2_debug
|
|
|
-librsvg_release: gtk2_release
|
|
|
+librsvg_all: gtk2_all fpmkunit
|
|
|
+librsvg_shared: gtk2_shared fpmkunit
|
|
|
+librsvg_smart: gtk2_smart fpmkunit
|
|
|
+librsvg_debug: gtk2_debug fpmkunit
|
|
|
+librsvg_release: gtk2_release fpmkunit
|
|
|
ifneq ($(findstring $(OS_TARGET),linux freebsd darwin iphonesim beos haiku),)
|
|
|
fcl-xml_all: iconvenc_all
|
|
|
fcl-xml_shared: iconvenc_shared
|
|
|
@@ -9802,3 +9780,33 @@ opencl_debug: opengl_debug
|
|
|
opencl_smart: opengl_smart
|
|
|
opencl_release: opengl_release
|
|
|
opencl_shared: opengl_shared
|
|
|
+libc_all: fpmkunit
|
|
|
+libc_shared: fpmkunit
|
|
|
+libc_smart: fpmkunit
|
|
|
+libc_debug: fpmkunit
|
|
|
+libc_release: fpmkunit
|
|
|
+libcurl_all: fpmkunit
|
|
|
+libcurl_shared: fpmkunit
|
|
|
+libcurl_smart: fpmkunit
|
|
|
+libcurl_debug: fpmkunit
|
|
|
+libcurl_release: fpmkunit
|
|
|
+libgd_all: fpmkunit
|
|
|
+libgd_shared: fpmkunit
|
|
|
+libgd_smart: fpmkunit
|
|
|
+libgd_debug: fpmkunit
|
|
|
+libgd_release: fpmkunit
|
|
|
+libogcfpc_all: fpmkunit
|
|
|
+libogcfpc_shared: fpmkunit
|
|
|
+libogcfpc_smart: fpmkunit
|
|
|
+libogcfpc_debug: fpmkunit
|
|
|
+libogcfpc_release: fpmkunit
|
|
|
+libsee_all: fpmkunit
|
|
|
+libsee_shared: fpmkunit
|
|
|
+libsee_smart: fpmkunit
|
|
|
+libsee_debug: fpmkunit
|
|
|
+libsee_release: fpmkunit
|
|
|
+liblua_all: fpmkunit
|
|
|
+liblua_shared: fpmkunit
|
|
|
+liblua_smart: fpmkunit
|
|
|
+liblua_debug: fpmkunit
|
|
|
+liblua_release: fpmkunit
|
joost