diff options
Diffstat (limited to 'tests/utils/testsuite/Makefile')
-rw-r--r-- | tests/utils/testsuite/Makefile | 213 |
1 files changed, 205 insertions, 8 deletions
diff --git a/tests/utils/testsuite/Makefile b/tests/utils/testsuite/Makefile index 51309c0324..95db282c0a 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 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 powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux +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 jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -360,6 +370,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=testsuite endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=testsuite +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=testsuite endif @@ -471,6 +484,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=testsuite endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=testsuite +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=testsuite endif @@ -498,6 +514,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testsuite endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=testsuite +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=testsuite +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=.. endif @@ -564,6 +586,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITDIR+=.. endif @@ -675,6 +700,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=.. endif @@ -702,6 +730,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_UNITDIR+=.. +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_UNITDIR+=.. +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -961,6 +995,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1090,6 +1132,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1338,6 +1394,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1347,6 +1404,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1356,6 +1414,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1365,6 +1424,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1374,6 +1434,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1383,6 +1444,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1392,6 +1454,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1401,6 +1464,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1410,6 +1474,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1419,6 +1484,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1428,6 +1494,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1437,6 +1504,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1446,6 +1514,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1455,6 +1524,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1464,6 +1534,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1473,6 +1544,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1482,6 +1554,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1491,6 +1564,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1500,6 +1574,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1509,6 +1584,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1518,6 +1594,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1527,6 +1604,17 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1536,6 +1624,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1545,6 +1634,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1554,6 +1644,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1563,6 +1654,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1572,6 +1664,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1581,6 +1674,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1590,6 +1684,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1599,6 +1694,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1608,6 +1704,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1617,6 +1714,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1626,6 +1724,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1635,6 +1734,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1644,6 +1744,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1653,6 +1754,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1662,6 +1764,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1671,6 +1774,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1680,6 +1784,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1689,6 +1794,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1698,6 +1804,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1707,6 +1814,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1716,6 +1824,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1725,6 +1834,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1734,6 +1844,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1743,6 +1854,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1752,6 +1864,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1761,6 +1874,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1770,6 +1884,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1779,6 +1894,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1788,6 +1904,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1797,6 +1914,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1806,6 +1924,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1815,6 +1934,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1824,6 +1944,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1833,6 +1954,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1842,6 +1964,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1851,6 +1974,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1860,6 +1984,17 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1869,6 +2004,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1878,6 +2014,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1887,6 +2024,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1896,6 +2034,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1905,6 +2044,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1914,6 +2054,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1923,6 +2064,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1932,6 +2074,7 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -1941,6 +2084,27 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-RES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-DB=1 endif @@ -2134,6 +2298,44 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif +ifdef REQUIRE_PACKAGES_FCL-RES +PACKAGEDIR_FCL-RES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-RES),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-RES)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-RES) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-RES)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-RES= +UNITDIR_FCL-RES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-RES),) +UNITDIR_FCL-RES:=$(firstword $(UNITDIR_FCL-RES)) +else +UNITDIR_FCL-RES= +endif +endif +ifdef UNITDIR_FCL-RES +override COMPILER_UNITDIR+=$(UNITDIR_FCL-RES) +endif +ifdef UNITDIR_FPMAKE_FCL-RES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-RES) +endif +endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FCL-BASE),) @@ -2322,17 +2524,12 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg -ifeq ($(CPU_TARGET),i386) -override FPCOPT+=-Aas endif -endif -ifeq ($(findstring 2.0.,$(FPC_VERSION)),) ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef GCCLIBDIR |