* patch from Olivier

git-svn-id: trunk@10428 -
This commit is contained in:
marco 2008-03-02 16:43:06 +00:00
parent b7ebebe7fd
commit a7370144f0
10 changed files with 169 additions and 21 deletions

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/06] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
# #
default: all 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -256,7 +256,7 @@ ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv graph gdbint mysql ibase postgres odbc sqlite pthreads imagemagick override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl gnome1 httpd22 pxlib override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2 bfd aspell svgalib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl gnome1 httpd22 pxlib
@ -399,6 +399,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json fcl-process unzip regexpr chm numlib
endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
override INSTALL_FPCSUBDIR=packages override INSTALL_FPCSUBDIR=packages
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
@ -1742,15 +1745,44 @@ TARGET_DIRS_REGEXPR=1
TARGET_DIRS_CHM=1 TARGET_DIRS_CHM=1
TARGET_DIRS_NUMLIB=1 TARGET_DIRS_NUMLIB=1
TARGET_DIRS_FV=1 TARGET_DIRS_FV=1
TARGET_DIRS_GRAPH=1 TARGET_DIRS_FCL-WEB=1
TARGET_DIRS_GDBINT=1 TARGET_DIRS_FCL-ASYNC=1
TARGET_DIRS_MYSQL=1
TARGET_DIRS_IBASE=1 TARGET_DIRS_IBASE=1
TARGET_DIRS_POSTGRES=1 TARGET_DIRS_MYSQL=1
TARGET_DIRS_NCURSES=1
TARGET_DIRS_ZLIB=1
TARGET_DIRS_ORACLE=1
TARGET_DIRS_ODBC=1 TARGET_DIRS_ODBC=1
TARGET_DIRS_POSTGRES=1
TARGET_DIRS_SQLITE=1 TARGET_DIRS_SQLITE=1
TARGET_DIRS_PTHREADS=1 TARGET_DIRS_PTHREADS=1
TARGET_DIRS_IMAGEMAGICK=1 TARGET_DIRS_IMAGEMAGICK=1
TARGET_DIRS_GDBINT=1
TARGET_DIRS_LIBPNG=1
TARGET_DIRS_X11=1
TARGET_DIRS_GDBM=1
TARGET_DIRS_TCL=1
TARGET_DIRS_SYSLOG=1
TARGET_DIRS_LIBCURL=1
TARGET_DIRS_OPENGL=1
TARGET_DIRS_BFD=1
TARGET_DIRS_ASPELL=1
TARGET_DIRS_SVGALIB=1
TARGET_DIRS_IMLIB=1
TARGET_DIRS_UTMP=1
TARGET_DIRS_FPGTK=1
TARGET_DIRS_XFORMS=1
TARGET_DIRS_FFTW=1
TARGET_DIRS_PCAP=1
TARGET_DIRS_GGI=1
TARGET_DIRS_SDL=1
TARGET_DIRS_OPENSSL=1
TARGET_DIRS_GRAPH=1
TARGET_DIRS_GNOME1=1
TARGET_DIRS_GTK1=1
TARGET_DIRS_GTK2=1
TARGET_DIRS_HTTPD22=1
TARGET_DIRS_PXLIB=1
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
TARGET_DIRS_HASH=1 TARGET_DIRS_HASH=1
@ -3617,6 +3649,26 @@ TARGET_DIRS_REGEXPR=1
TARGET_DIRS_CHM=1 TARGET_DIRS_CHM=1
TARGET_DIRS_NUMLIB=1 TARGET_DIRS_NUMLIB=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
TARGET_DIRS_HASH=1
TARGET_DIRS_PASJPEG=1
TARGET_DIRS_PASZLIB=1
TARGET_DIRS_FPMKUNIT=1
TARGET_DIRS_FCL-BASE=1
TARGET_DIRS_FCL-DB=1
TARGET_DIRS_FCL-IMAGE=1
TARGET_DIRS_FCL-NET=1
TARGET_DIRS_FCL-PASSRC=1
TARGET_DIRS_FCL-REGISTRY=1
TARGET_DIRS_FCL-XML=1
TARGET_DIRS_FCL-FPCUNIT=1
TARGET_DIRS_FCL-JSON=1
TARGET_DIRS_FCL-PROCESS=1
TARGET_DIRS_UNZIP=1
TARGET_DIRS_REGEXPR=1
TARGET_DIRS_CHM=1
TARGET_DIRS_NUMLIB=1
endif
ifdef TARGET_DIRS_HASH ifdef TARGET_DIRS_HASH
hash_all: hash_all:
$(MAKE) -C hash all $(MAKE) -C hash all

View File

@ -12,6 +12,9 @@ dirs_powerpc64_linux=graph
dirs_sparc_linux=graph dirs_sparc_linux=graph
dirs_arm_linux=graph dirs_arm_linux=graph
dirs_m68k_linux=graph dirs_m68k_linux=graph
dirs_beos=fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
gdbint libpng x11 gdbm tcl syslog libcurl opengl bfd aspell svgalib \
imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib
dirs_freebsd=fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ dirs_freebsd=fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib \ gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo bfd aspell svgalib \
imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib imlib utmp fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2 httpd22 pxlib
@ -45,7 +48,6 @@ dirs_netware=fv zlib unzip
dirs_netwlibc=fv zlib unzip dirs_netwlibc=fv zlib unzip
dirs_palmos=palmunits dirs_palmos=palmunits
dirs_go32v2=fv graph unzip gdbint dirs_go32v2=fv graph unzip gdbint
dirs_beos=fv graph gdbint mysql ibase postgres odbc sqlite pthreads imagemagick
dirs_amiga=amunits dirs_amiga=amunits
[install] [install]

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/06] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
# #
default: all 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -258,7 +258,7 @@ ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/export src/datadict src/codegen
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox
@ -401,6 +401,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-S2h override COMPILER_OPTIONS+=-S2h
@ -561,6 +564,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-S2h override COMPILER_OPTIONS+=-S2h
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_OPTIONS+=-S2h
endif
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif endif
@ -1380,6 +1386,12 @@ REQUIRE_PACKAGES_PXLIB=1
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-BASE=1
@ -1658,6 +1670,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-BASE=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_FCL-BASE=1
endif
ifdef REQUIRE_PACKAGES_FCL-BASE ifdef REQUIRE_PACKAGES_FCL-BASE
PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_FCL-BASE),) ifneq ($(PACKAGEDIR_FCL-BASE),)
@ -2463,6 +2478,11 @@ TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1 TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1 TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1 TARGET_DIRS_SRC/BASE=1
TARGET_DIRS_SRC/DBASE=1
TARGET_DIRS_SRC/SQLITE=1
TARGET_DIRS_SRC/EXPORT=1
TARGET_DIRS_SRC/DATADICT=1
TARGET_DIRS_SRC/CODEGEN=1
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/SDF=1
@ -2838,6 +2858,12 @@ TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1 TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1 TARGET_DIRS_SRC/BASE=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
endif
ifdef TARGET_DIRS_SRC/SDF ifdef TARGET_DIRS_SRC/SDF
src/sdf_all: src/sdf_all:
$(MAKE) -C src/sdf all $(MAKE) -C src/sdf all

View File

@ -8,6 +8,7 @@ version=2.0.0
[target] [target]
dirs=src/sdf src/memds src/sqldb src/base dirs=src/sdf src/memds src/sqldb src/base
dirs_beos=src/dbase src/sqlite src/export src/datadict src/codegen
dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
dirs_darwin=src/dbase src/sqlite dirs_darwin=src/dbase src/sqlite

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
# #
default: all 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -251,6 +251,9 @@ endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite
endif endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite
endif endif
@ -473,6 +476,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=sqldb override TARGET_UNITS+=sqldb
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=sqldb
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_RSTS+=sqldb override TARGET_RSTS+=sqldb
endif endif
@ -632,6 +638,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_RSTS+=sqldb override TARGET_RSTS+=sqldb
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_RSTS+=sqldb
endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-S2 override COMPILER_OPTIONS+=-S2
@ -792,6 +801,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-S2 override COMPILER_OPTIONS+=-S2
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_OPTIONS+=-S2
endif
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif endif
@ -1606,6 +1618,12 @@ REQUIRE_PACKAGES_SQLITE=1
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_ORACLE=1
REQUIRE_PACKAGES_SQLITE=1
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -1866,6 +1884,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -2208,7 +2229,7 @@ endif
endif endif
endif endif
.PHONY: fpc_units .PHONY: fpc_units
ifneq ($(TARGET_UNITS),) ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
override ALLTARGET+=fpc_units override ALLTARGET+=fpc_units
override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@ -2561,6 +2582,14 @@ TARGET_DIRS_ODBC=1
TARGET_DIRS_ORACLE=1 TARGET_DIRS_ORACLE=1
TARGET_DIRS_SQLITE=1 TARGET_DIRS_SQLITE=1
endif endif
ifeq ($(FULL_TARGET),i386-beos)
TARGET_DIRS_INTERBASE=1
TARGET_DIRS_POSTGRES=1
TARGET_DIRS_MYSQL=1
TARGET_DIRS_ODBC=1
TARGET_DIRS_ORACLE=1
TARGET_DIRS_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
TARGET_DIRS_INTERBASE=1 TARGET_DIRS_INTERBASE=1
TARGET_DIRS_POSTGRES=1 TARGET_DIRS_POSTGRES=1

View File

@ -6,6 +6,7 @@
main=fcl-db main=fcl-db
[target] [target]
dirs_beos=interbase postgres mysql odbc oracle sqlite
dirs_linux=interbase postgres mysql odbc oracle sqlite dirs_linux=interbase postgres mysql odbc oracle sqlite
dirs_freebsd=interbase postgres mysql odbc oracle sqlite dirs_freebsd=interbase postgres mysql odbc oracle sqlite
dirs_darwin=interbase postgres mysql odbc oracle sqlite dirs_darwin=interbase postgres mysql odbc oracle sqlite

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
# #
default: all 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -242,7 +242,7 @@ endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=gtk2 override PACKAGE_NAME=gtk2
override PACKAGE_VERSION=2.0.0 override PACKAGE_VERSION=2.0.0
ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin ),) ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos ),)
GDK2X=gdk2x GDK2X=gdk2x
GTK2X11=gtk2x11 GTK2X11=gtk2x11
GTK2X11INCLUDE=src/gtk2x11/include GTK2X11INCLUDE=src/gtk2x11/include
@ -406,6 +406,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=src/buildgtk2 override TARGET_UNITS+=src/buildgtk2
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=src/buildgtk2
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_IMPLICITUNITS+=glib2 atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) override TARGET_IMPLICITUNITS+=glib2 atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X)
endif endif
@ -565,6 +568,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_IMPLICITUNITS+=glib2 atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X) override TARGET_IMPLICITUNITS+=glib2 atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X)
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_IMPLICITUNITS+=glib2 atk pango gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext $(GDK2X)
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
@ -724,6 +730,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_EXAMPLEDIRS+=examples
endif
override INSTALL_BUILDUNIT=buildgtk2 override INSTALL_BUILDUNIT=buildgtk2
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
@ -885,6 +894,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE)
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE)
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/$(GTK2X11) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/$(GTK2X11)
endif endif
@ -1044,6 +1056,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/$(GTK2X11) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/$(GTK2X11)
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/$(GTK2X11)
endif
override SHARED_BUILD=n override SHARED_BUILD=n
override SHARED_BUILD=n override SHARED_BUILD=n
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
@ -1844,6 +1859,7 @@ REQUIRE_PACKAGES_X11=1
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -2006,6 +2022,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -2810,6 +2829,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifdef TARGET_EXAMPLEDIRS_EXAMPLES ifdef TARGET_EXAMPLEDIRS_EXAMPLES
examples_all: examples_all:
$(MAKE) -C examples all $(MAKE) -C examples all

View File

@ -8,6 +8,7 @@ version=2.0.0
[require] [require]
libc=y libc=y
packages_beos=x11
packages_linux=x11 packages_linux=x11
packages_freebsd=x11 packages_freebsd=x11
packages_solaris=x11 packages_solaris=x11
@ -35,7 +36,7 @@ build=n
fpcdir=../.. fpcdir=../..
[prerules] [prerules]
ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin ),) ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos ),)
GDK2X=gdk2x GDK2X=gdk2x
GTK2X11=gtk2x11 GTK2X11=gtk2x11
GTK2X11INCLUDE=src/gtk2x11/include GTK2X11INCLUDE=src/gtk2x11/include

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/14] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/01]
# #
default: all 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -251,6 +251,9 @@ endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=pxlib override TARGET_UNITS+=pxlib
endif endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=pxlib
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=pxlib override TARGET_UNITS+=pxlib
endif endif
@ -314,6 +317,9 @@ endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_EXAMPLES+=ppxview override TARGET_EXAMPLES+=ppxview
endif endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_EXAMPLES+=ppxview
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_EXAMPLES+=ppxview override TARGET_EXAMPLES+=ppxview
endif endif
@ -528,6 +534,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_SOURCEDIR+=src
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_SOURCEDIR+=src
endif
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif endif
@ -1435,6 +1444,9 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1615,7 +1627,7 @@ endif
endif endif
endif endif
.PHONY: fpc_units .PHONY: fpc_units
ifneq ($(TARGET_UNITS),) ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
override ALLTARGET+=fpc_units override ALLTARGET+=fpc_units
override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))

View File

@ -7,12 +7,14 @@ name=pxlib
version=2.0.0 version=2.0.0
[target] [target]
units_beos=pxlib
units_linux=pxlib units_linux=pxlib
units_win32=pxlib units_win32=pxlib
units_darwin=pxlib units_darwin=pxlib
units_freebsd=pxlib units_freebsd=pxlib
units_openbsd=pxlib units_openbsd=pxlib
units_netbsd=pxlib units_netbsd=pxlib
examples_beos=ppxview
examples_linux=ppxview examples_linux=ppxview
examples_win32=ppxview examples_win32=ppxview
examples_darwin=ppxview examples_darwin=ppxview