|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/15]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/07/06]
|
|
|
#
|
|
|
default: allexectests
|
|
|
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
|
|
|
@@ -1174,7 +1174,7 @@ override FPCOPT+=-Aas
|
|
|
endif
|
|
|
endif
|
|
|
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
|
|
|
-ifeq ($(OS_TARGET),linux)
|
|
|
+ifneq ($(findstring $(OS_TARGET),linux solaris),)
|
|
|
ifeq ($(CPU_TARGET),x86_64)
|
|
|
override FPCOPT+=-Cg
|
|
|
endif
|
|
|
@@ -1647,8 +1647,9 @@ ifdef EMULATOR
|
|
|
override DOTESTOPT+=-M$(EMULATOR)
|
|
|
endif
|
|
|
ifdef USEENV
|
|
|
-override DOTESTENV=$(DOTESTOPT)
|
|
|
+override DOTESTENV:=$(DOTESTOPT)
|
|
|
override DOTESTOPT=!DOTESTENV
|
|
|
+export DOTESTENV
|
|
|
endif
|
|
|
DIRS=webtbs webtbf tbs tbf $(TESTDIRS)
|
|
|
vpath %.log $(TEST_OUTPUTDIR)
|
pierre