|
|
@@ -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/05]
|
|
|
#
|
|
|
default: help
|
|
|
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
|
|
|
@@ -393,12 +393,18 @@ BUILDOPTS=FPC=$(PPNEW) RELEASE=1
|
|
|
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
|
|
|
ifndef CROSSCOMPILE
|
|
|
ifneq ($(wildcard ide),)
|
|
|
-IDETARGETS=go32v2 win32 win64 linux freebsd os2 emx beos haiku
|
|
|
+IDETARGETS=go32v2 win32 win64 linux freebsd os2 emx beos haiku
|
|
|
ifneq ($(findstring $(OS_TARGET),$(IDETARGETS)),)
|
|
|
IDE=1
|
|
|
endif
|
|
|
endif
|
|
|
endif
|
|
|
+ifneq ($(wildcard utils),)
|
|
|
+NOUTILSTARGETS=embedded gba
|
|
|
+ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
|
|
|
+UTILS=1
|
|
|
+endif
|
|
|
+endif
|
|
|
ifeq ($(FULL_TARGET),i386-linux)
|
|
|
override TARGET_DIRS+=compiler rtl utils packages ide installer
|
|
|
endif
|
|
|
@@ -1173,25 +1179,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)
|
|
|
@@ -1217,12 +1204,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
|
|
|
@@ -1383,9 +1374,6 @@ endif
|
|
|
fpc_install: all $(INSTALLTARGET)
|
|
|
ifdef INSTALLEXEFILES
|
|
|
$(MKDIR) $(INSTALL_BINDIR)
|
|
|
-ifdef UPXPROG
|
|
|
- -$(UPXPROG) $(INSTALLEXEFILES)
|
|
|
-endif
|
|
|
$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
|
|
|
endif
|
|
|
ifdef INSTALL_CREATEPACKAGEFPC
|
|
|
@@ -1644,7 +1632,6 @@ fpc_baseinfo:
|
|
|
@$(ECHO) Date...... $(DATE)
|
|
|
@$(ECHO) FPCMake... $(FPCMAKE)
|
|
|
@$(ECHO) PPUMove... $(PPUMOVE)
|
|
|
- @$(ECHO) Upx....... $(UPXPROG)
|
|
|
@$(ECHO) Zip....... $(ZIPPROG)
|
|
|
@$(ECHO)
|
|
|
@$(ECHO) == Object info ==
|
|
|
@@ -2523,14 +2510,18 @@ $(BUILDSTAMP):
|
|
|
$(MAKE) compiler_cycle RELEASE=1
|
|
|
$(MAKE) rtl_clean $(CLEANOPTS)
|
|
|
$(MAKE) packages_clean $(CLEANOPTS)
|
|
|
+ifdef UTILS
|
|
|
$(MAKE) utils_clean $(CLEANOPTS)
|
|
|
+endif
|
|
|
ifdef IDE
|
|
|
$(MAKE) ide_clean $(CLEANOPTS)
|
|
|
$(MAKE) installer_clean $(CLEANOPTS)
|
|
|
endif
|
|
|
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
|
|
|
$(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
|
|
|
+ifdef UTILS
|
|
|
$(MAKE) utils_all $(BUILDOPTS)
|
|
|
+endif
|
|
|
ifdef IDE
|
|
|
$(MAKE) ide_all $(BUILDOPTS)
|
|
|
$(MAKE) installer_all $(BUILDOPTS)
|
|
|
@@ -2549,7 +2540,9 @@ installbase:
|
|
|
$(MAKE) rtl_$(INSTALLTARGET) $(INSTALLOPTS)
|
|
|
installother:
|
|
|
$(MAKE) packages_$(INSTALLTARGET) $(INSTALLOPTS)
|
|
|
+ifdef UTILS
|
|
|
$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
|
|
|
+endif
|
|
|
ifdef IDE
|
|
|
$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
|
|
|
endif
|
|
|
@@ -2557,7 +2550,9 @@ zipinstallbase:
|
|
|
$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base $(INSTALLOPTS)
|
|
|
zipinstallother:
|
|
|
$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
|
|
|
+ifdef UTILS
|
|
|
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
|
|
|
+endif
|
|
|
ifdef IDE
|
|
|
$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
|
|
|
endif
|
florian