|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-03-19 rev 27188]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-04-01 rev 27428]
|
|
|
#
|
|
|
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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos
|
|
|
@@ -2487,17 +2487,23 @@ ifdef ACROSSCOMPILE
|
|
|
override FPCOPT+=$(CROSSOPT)
|
|
|
endif
|
|
|
override COMPILER:=$(strip $(FPC) $(FPCOPT))
|
|
|
-ifeq (,$(findstring -s ,$(COMPILER)))
|
|
|
+ifneq (,$(findstring -sh ,$(COMPILER)))
|
|
|
+UseEXECPPAS=1
|
|
|
+endif
|
|
|
+ifneq (,$(findstring -s ,$(COMPILER)))
|
|
|
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
|
|
+UseEXECPPAS=1
|
|
|
+endif
|
|
|
+endif
|
|
|
+ifneq ($(UseEXECPPAS),1)
|
|
|
EXECPPAS=
|
|
|
else
|
|
|
-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
|
|
ifdef RUNBATCH
|
|
|
EXECPPAS:=@$(RUNBATCH) $(PPAS)
|
|
|
else
|
|
|
EXECPPAS:=@$(PPAS)
|
|
|
endif
|
|
|
endif
|
|
|
-endif
|
|
|
.PHONY: fpc_loaders
|
|
|
ifneq ($(TARGET_LOADERS),)
|
|
|
override ALLTARGET+=fpc_loaders
|
|
|
@@ -2912,6 +2918,7 @@ baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
|
|
|
$(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
|
|
|
$(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \
|
|
|
$(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT) sysctl$(PPUEXT)
|
|
|
+unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(UNIXINC)/ctypes.inc ptypes.inc $(SYSTEMUNIT)$(PPUEXT)
|
|
|
unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
|
|
|
syscalls.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc \
|
|
|
unxsysc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
pierre