From 1a2308afc44a6ee5b4ac4db1e69a8e141941bdf0 Mon Sep 17 00:00:00 2001 From: oro06 Date: Tue, 27 Dec 2005 16:40:56 +0000 Subject: [PATCH] +arm/wince more db, extrapackages git-svn-id: trunk@2066 - --- fcl/db/Makefile | 18 +++++++++++++++--- fcl/db/Makefile.fpc | 1 + fcl/db/sqldb/Makefile | 20 +++++++++++++++++++- fcl/db/sqldb/Makefile.fpc | 1 + packages/base/ibase/ibase60.inc | 6 ++++++ packages/base/postgres/dllistdyn.pp | 4 ++++ packages/extra/Makefile | 20 +++++++++++++++++++- packages/extra/Makefile.fpc | 1 + 8 files changed, 66 insertions(+), 5 deletions(-) diff --git a/fcl/db/Makefile b/fcl/db/Makefile index e79ac62cd7..b4a7cf6e6a 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/26] # 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-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-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux @@ -278,7 +278,7 @@ ifeq ($(FULL_TARGET),i386-netwlibc) override TARGET_DIRS+=sdf memds sqldb endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=sdf memds sqldb +override TARGET_DIRS+=sdf memds sqldb interbase sqlite dbase endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=sdf memds sqldb mysql interbase sqlite dbase @@ -338,7 +338,7 @@ ifeq ($(FULL_TARGET),arm-linux) override TARGET_DIRS+=sdf memds sqldb mysql interbase sqlite dbase endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=sdf memds sqldb +override TARGET_DIRS+=sdf memds sqldb interbase sqlite dbase endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=sdf memds sqldb mysql interbase sqlite dbase @@ -1620,6 +1620,9 @@ REQUIRE_PACKAGES_RTL=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_POSTGRES=1 +REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1740,6 +1743,9 @@ REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_POSTGRES=1 +REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2460,6 +2466,9 @@ ifeq ($(FULL_TARGET),i386-wince) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 +TARGET_DIRS_INTERBASE=1 +TARGET_DIRS_SQLITE=1 +TARGET_DIRS_DBASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_SDF=1 @@ -2603,6 +2612,9 @@ ifeq ($(FULL_TARGET),arm-wince) TARGET_DIRS_SDF=1 TARGET_DIRS_MEMDS=1 TARGET_DIRS_SQLDB=1 +TARGET_DIRS_INTERBASE=1 +TARGET_DIRS_SQLITE=1 +TARGET_DIRS_DBASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_SDF=1 diff --git a/fcl/db/Makefile.fpc b/fcl/db/Makefile.fpc index cf4c2fa393..f1f30befc8 100644 --- a/fcl/db/Makefile.fpc +++ b/fcl/db/Makefile.fpc @@ -14,6 +14,7 @@ dirs_darwin=mysql interbase sqlite dirs_netbsd=mysql interbase sqlite dirs_openbsd=mysql interbase sqlite dirs_win32=mysql interbase sqlite dbase +dirs_wince=interbase sqlite dbase units=dbconst db ddg_ds ddg_rec dbwhtml exampledirs=tests rsts=dbwhtml dbconst diff --git a/fcl/db/sqldb/Makefile b/fcl/db/sqldb/Makefile index 19f5c973df..72ebe66223 100644 --- a/fcl/db/sqldb/Makefile +++ b/fcl/db/sqldb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/26] # 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-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-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux @@ -247,6 +247,9 @@ endif ifeq ($(FULL_TARGET),i386-openbsd) override TARGET_DIRS+=interbase postgres mysql odbc endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=interbase postgres +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=interbase postgres mysql odbc endif @@ -283,6 +286,9 @@ endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_DIRS+=interbase postgres mysql odbc endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=interbase postgres +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=interbase postgres mysql odbc endif @@ -1447,6 +1453,8 @@ REQUIRE_PACKAGES_RTL=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_POSTGRES=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1555,6 +1563,8 @@ REQUIRE_PACKAGES_ODBC=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_POSTGRES=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2163,6 +2173,10 @@ TARGET_DIRS_POSTGRES=1 TARGET_DIRS_MYSQL=1 TARGET_DIRS_ODBC=1 endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_INTERBASE=1 +TARGET_DIRS_POSTGRES=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_INTERBASE=1 TARGET_DIRS_POSTGRES=1 @@ -2235,6 +2249,10 @@ TARGET_DIRS_POSTGRES=1 TARGET_DIRS_MYSQL=1 TARGET_DIRS_ODBC=1 endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_INTERBASE=1 +TARGET_DIRS_POSTGRES=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_INTERBASE=1 TARGET_DIRS_POSTGRES=1 diff --git a/fcl/db/sqldb/Makefile.fpc b/fcl/db/sqldb/Makefile.fpc index db7279a5cf..b88325c54d 100644 --- a/fcl/db/sqldb/Makefile.fpc +++ b/fcl/db/sqldb/Makefile.fpc @@ -12,6 +12,7 @@ dirs_darwin=interbase postgres mysql odbc dirs_netbsd=interbase postgres mysql odbc dirs_openbsd=interbase postgres mysql odbc dirs_win32=interbase postgres mysql odbc +dirs_wince=interbase postgres units=sqldb rsts=sqldb diff --git a/packages/base/ibase/ibase60.inc b/packages/base/ibase/ibase60.inc index bc06c58119..ba56afa679 100644 --- a/packages/base/ibase/ibase60.inc +++ b/packages/base/ibase/ibase60.inc @@ -22,6 +22,12 @@ uses Dynlibs, sysutils; gdslib = 'gds32.dll'; fbclib = 'fbclient.dll'; {$ENDIF} +{$IFDEF Wince} + {$DEFINE extdecl:=stdcall} + const + gdslib = 'gds32.dll'; + fbclib = 'fbclient.dll'; +{$ENDIF} type { Unsigned types } diff --git a/packages/base/postgres/dllistdyn.pp b/packages/base/postgres/dllistdyn.pp index 21ee2808eb..47941d95c0 100644 --- a/packages/base/postgres/dllistdyn.pp +++ b/packages/base/postgres/dllistdyn.pp @@ -22,6 +22,10 @@ uses const pqlib = 'libpq.dll'; {$ENDIF} +{$IFDEF Wince} + const + pqlib = 'libpq.dll'; +{$ENDIF} {$i dllisttypes.inc} diff --git a/packages/extra/Makefile b/packages/extra/Makefile index 9f1a197cc2..f36b8b0c96 100644 --- a/packages/extra/Makefile +++ b/packages/extra/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/26] # 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-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-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux @@ -260,6 +260,9 @@ endif ifeq ($(FULL_TARGET),i386-netwlibc) override TARGET_DIRS+=unzip zlib endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=unzip zlib tcl fftw +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid endif @@ -302,6 +305,9 @@ endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=unzip zlib tcl fftw +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid endif @@ -1488,6 +1494,12 @@ ifeq ($(FULL_TARGET),i386-netwlibc) TARGET_DIRS_UNZIP=1 TARGET_DIRS_ZLIB=1 endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_UNZIP=1 +TARGET_DIRS_ZLIB=1 +TARGET_DIRS_TCL=1 +TARGET_DIRS_FFTW=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_UNZIP=1 TARGET_DIRS_ZLIB=1 @@ -1782,6 +1794,12 @@ TARGET_DIRS_UNIXUTIL=1 TARGET_DIRS_NEWT=1 TARGET_DIRS_UUID=1 endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_UNZIP=1 +TARGET_DIRS_ZLIB=1 +TARGET_DIRS_TCL=1 +TARGET_DIRS_FFTW=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_UNZIP=1 TARGET_DIRS_ZLIB=1 diff --git a/packages/extra/Makefile.fpc b/packages/extra/Makefile.fpc index d5db08d38b..51345b902d 100644 --- a/packages/extra/Makefile.fpc +++ b/packages/extra/Makefile.fpc @@ -20,6 +20,7 @@ dirs_openbsd=unzip zlib \ forms svgalib ggi libpng libgd \ utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 dirs_win32=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw +dirs_wince=unzip zlib tcl fftw dirs_os2=os2units \ rexx \ unzip zlib \