From b6feb006f65f50dfa801b571c6635875e8558cdc Mon Sep 17 00:00:00 2001 From: micha Date: Sun, 17 Dec 2006 21:17:36 +0000 Subject: [PATCH] * enable compilation of tdbf for win64 git-svn-id: trunk@5630 - --- fcl/db/Makefile | 173 +++++++++++++++++++++++++++++++++++++- fcl/db/Makefile.fpc | 1 + fcl/db/dbase/Makefile | 96 ++++++++++++++++++++- fcl/db/dbase/Makefile.fpc | 4 +- 4 files changed, 269 insertions(+), 5 deletions(-) diff --git a/fcl/db/Makefile b/fcl/db/Makefile index 399e0a2a30..6d87f56367 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/17] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -283,6 +283,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif @@ -304,6 +307,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=sdf memds sqldb unmaintained endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),powerpc-linux) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif @@ -322,6 +328,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override TARGET_DIRS+=sdf memds sqldb unmaintained endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif @@ -331,6 +340,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override TARGET_DIRS+=sdf memds sqldb unmaintained endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif @@ -338,6 +350,9 @@ ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=sdf memds sqldb unmaintained dbase +endif +ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=sdf memds sqldb unmaintained endif ifeq ($(FULL_TARGET),arm-linux) @@ -352,9 +367,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override TARGET_DIRS+=sdf memds sqldb unmaintained endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=sdf memds sqldb unmaintained dbase sqlite endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=sdf memds sqldb unmaintained +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -406,6 +430,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -427,6 +454,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),powerpc-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -445,6 +475,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -454,6 +487,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -463,6 +499,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif @@ -475,9 +514,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -529,6 +577,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -550,6 +601,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),powerpc-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -568,6 +622,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -577,6 +634,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -586,6 +646,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_RSTS+=dbwhtml dbconst endif @@ -598,9 +661,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_RSTS+=dbwhtml dbconst +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_RSTS+=dbwhtml dbconst endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_RSTS+=dbwhtml dbconst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase @@ -653,6 +725,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif @@ -674,6 +749,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),powerpc-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif @@ -692,6 +770,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif @@ -701,6 +782,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),x86_64-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif @@ -710,6 +794,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif @@ -722,9 +809,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-S2 -Fudbase -Fidbase +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1590,6 +1686,9 @@ REQUIRE_PACKAGES_IBASE=1 REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1635,6 +1734,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1671,6 +1773,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1692,6 +1797,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1713,6 +1821,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1734,6 +1845,12 @@ endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1743,6 +1860,9 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2515,6 +2635,12 @@ TARGET_DIRS_UNMAINTAINED=1 TARGET_DIRS_DBASE=1 TARGET_DIRS_SQLITE=1 endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 @@ -2563,6 +2689,12 @@ TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 TARGET_DIRS_UNMAINTAINED=1 endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifeq ($(FULL_TARGET),powerpc-linux) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 @@ -2603,6 +2735,12 @@ TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 TARGET_DIRS_UNMAINTAINED=1 endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 @@ -2624,6 +2762,12 @@ TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 TARGET_DIRS_UNMAINTAINED=1 endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifeq ($(FULL_TARGET),x86_64-linux) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 @@ -2645,6 +2789,13 @@ TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 TARGET_DIRS_UNMAINTAINED=1 +TARGET_DIRS_DBASE=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 endif ifeq ($(FULL_TARGET),arm-linux) TARGET_DIRS_SDF=1 @@ -2674,6 +2825,18 @@ TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 TARGET_DIRS_UNMAINTAINED=1 endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 @@ -2682,6 +2845,12 @@ TARGET_DIRS_UNMAINTAINED=1 TARGET_DIRS_DBASE=1 TARGET_DIRS_SQLITE=1 endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_SDF=1 +TARGET_DIRS_MEMDS=1 +TARGET_DIRS_SQLDB=1 +TARGET_DIRS_UNMAINTAINED=1 +endif ifdef TARGET_DIRS_SDF sdf_all: $(MAKE) -C sdf all diff --git a/fcl/db/Makefile.fpc b/fcl/db/Makefile.fpc index d945cfbd60..17a63bcc76 100644 --- a/fcl/db/Makefile.fpc +++ b/fcl/db/Makefile.fpc @@ -14,6 +14,7 @@ dirs_darwin=sqlite dirs_netbsd=sqlite dirs_openbsd=sqlite dirs_win32=dbase sqlite +dirs_win64=dbase dirs_wince=dbase sqlite units=dbconst db dbwhtml bufdataset_parser bufdataset rsts=dbwhtml dbconst diff --git a/fcl/db/dbase/Makefile b/fcl/db/dbase/Makefile index f49dc1858c..218c910d28 100644 --- a/fcl/db/dbase/Makefile +++ b/fcl/db/dbase/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/12/17] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded powerpc64-linux powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -233,6 +233,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext override PACKAGE_NAME=fcl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(OS_TARGET),win32) +ifneq ($(OS_TARGET),win64) ifeq ($(CPU_TARGET),i386) INSTALL_UNITS+=dbf_wtil CLEAN_UNITS+=dbf_wtil @@ -242,6 +243,7 @@ INSTALL_UNITS+=dbf_wtil CLEAN_UNITS+=dbf_wtil endif endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=dbf endif @@ -293,6 +295,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_UNITS+=dbf endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_UNITS+=dbf +endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_UNITS+=dbf endif @@ -302,6 +307,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_UNITS+=dbf endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_UNITS+=dbf +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testdbf endif @@ -353,6 +361,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override TARGET_EXAMPLES+=testdbf endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_EXAMPLES+=testdbf +endif ifeq ($(FULL_TARGET),x86_64-linux) override TARGET_EXAMPLES+=testdbf endif @@ -362,6 +373,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override TARGET_EXAMPLES+=testdbf endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_EXAMPLES+=testdbf +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -413,6 +427,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -434,6 +451,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),powerpc-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -452,6 +472,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -461,6 +484,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),x86_64-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -470,6 +496,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -482,9 +511,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),i386-linux) override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -536,6 +574,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),i386-embedded) +override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif ifeq ($(FULL_TARGET),x86_64-linux) override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif @@ -545,6 +586,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override INSTALL_UNITS+=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 -Sh @@ -597,6 +641,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -618,6 +665,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),powerpc-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -636,6 +686,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -645,6 +698,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),x86_64-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -654,6 +710,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -666,9 +725,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-S2 -Sh +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1464,6 +1532,9 @@ endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1485,6 +1556,9 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1503,6 +1577,9 @@ endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1512,6 +1589,9 @@ endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1521,6 +1601,9 @@ endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1533,9 +1616,18 @@ endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) diff --git a/fcl/db/dbase/Makefile.fpc b/fcl/db/dbase/Makefile.fpc index 941a64dc41..0e48ac6f1c 100644 --- a/fcl/db/dbase/Makefile.fpc +++ b/fcl/db/dbase/Makefile.fpc @@ -35,8 +35,9 @@ units=dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur \ dbf_prscore dbf_prsdef dbf_prssupp dbf_str [prerules] -# dbf_Wtil is needed on all targets except win32 +# dbf_Wtil is needed on all targets except windows ifneq ($(OS_TARGET),win32) +ifneq ($(OS_TARGET),win64) ifeq ($(CPU_TARGET),i386) INSTALL_UNITS+=dbf_wtil @@ -49,3 +50,4 @@ CLEAN_UNITS+=dbf_wtil endif endif +endif