From 81d0c485f81d8204cb2520e5fc264f2ef1d267db Mon Sep 17 00:00:00 2001 From: Vincent Snijders Date: Fri, 7 Apr 2006 10:12:27 +0000 Subject: [PATCH] * regenerated for i386-darwin support git-svn-id: trunk@3162 - --- fcl/Makefile | 76 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/fcl/Makefile b/fcl/Makefile index 1957aee808..f9f28e5481 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/05] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/07] # 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-palmos arm-wince 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 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-palmos arm-wince powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -268,6 +268,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override TARGET_DIRS+=xml image db shedit passrc net fpcunit endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=xml image db shedit passrc net fpcunit +endif ifeq ($(FULL_TARGET),i386-emx) override TARGET_DIRS+=xml image db shedit passrc net fpcunit endif @@ -382,6 +385,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override TARGET_UNITS+=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream streamex endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_UNITS+=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream streamex process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf +endif ifeq ($(FULL_TARGET),i386-emx) override TARGET_UNITS+=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream streamex resolve ssockets endif @@ -496,6 +502,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override TARGET_RSTS+=ssockets cachecls resolve custapp cgiapp eventlog registry simpleipc endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_RSTS+=ssockets cachecls resolve custapp cgiapp eventlog registry simpleipc +endif ifeq ($(FULL_TARGET),i386-emx) override TARGET_RSTS+=ssockets cachecls resolve custapp cgiapp eventlog registry simpleipc endif @@ -610,6 +619,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override TARGET_EXAMPLEDIRS+=tests endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_EXAMPLEDIRS+=tests +endif ifeq ($(FULL_TARGET),i386-emx) override TARGET_EXAMPLEDIRS+=tests endif @@ -724,6 +736,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio +endif ifeq ($(FULL_TARGET),i386-emx) override CLEAN_UNITS+=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads streamio endif @@ -839,6 +854,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),i386-emx) override COMPILER_OPTIONS+=-S2 endif @@ -953,6 +971,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc unix +endif ifeq ($(FULL_TARGET),i386-emx) override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc os2 endif @@ -1067,6 +1088,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) override COMPILER_SOURCEDIR+=$(OS_TARGET) inc endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=$(OS_TARGET) inc +endif ifeq ($(FULL_TARGET),i386-emx) override COMPILER_SOURCEDIR+=$(OS_TARGET) inc endif @@ -1816,12 +1840,17 @@ endif endif export ZIPPROG ifndef TARPROG +TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH)))) +ifeq ($(TARPROG),) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(TARPROG),) TARPROG= __missing_command_TARPROG else TARPROG:=$(firstword $(TARPROG)) endif +else +TARPROG:=$(firstword $(TARPROG)) +endif endif export TARPROG ASNAME=$(BINUTILSPREFIX)as @@ -2031,6 +2060,21 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +REQUIRE_PACKAGES_PTHREADS=1 +REQUIRE_PACKAGES_PASJPEG=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 ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -2699,14 +2743,15 @@ override FPCOPT+=-gl override FPCOPTDEF+=DEBUG endif ifdef RELEASE +ifneq ($(findstring 2.0.,$(FPC_VERSION)),) ifeq ($(CPU_TARGET),i386) FPCCPUOPT:=-OG2p3 -else +endif ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r -else -FPCCPUOPT:= endif +else +FPCCPUOPT:=-O2 endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE @@ -2715,9 +2760,7 @@ ifdef STRIP override FPCOPT+=-Xs endif ifdef OPTIMIZE -ifeq ($(CPU_TARGET),i386) -override FPCOPT+=-OG2p3 -endif +override FPCOPT+=-O2 endif ifdef VERBOSE override FPCOPT+=-vwni @@ -2761,11 +2804,6 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) endif endif -ifeq ($(OS_TARGET),linux) -ifeq ($(FPC_VERSION),1.0.6) -override FPCOPTDEF+=HASUNIX -endif -endif ifdef CREATESHARED override FPCOPT+=-Cg ifeq ($(CPU_TARGET),i386) @@ -3347,6 +3385,15 @@ TARGET_DIRS_PASSRC=1 TARGET_DIRS_NET=1 TARGET_DIRS_FPCUNIT=1 endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_XML=1 +TARGET_DIRS_IMAGE=1 +TARGET_DIRS_DB=1 +TARGET_DIRS_SHEDIT=1 +TARGET_DIRS_PASSRC=1 +TARGET_DIRS_NET=1 +TARGET_DIRS_FPCUNIT=1 +endif ifeq ($(FULL_TARGET),i386-emx) TARGET_DIRS_XML=1 TARGET_DIRS_IMAGE=1 @@ -3932,6 +3979,9 @@ endif ifeq ($(FULL_TARGET),i386-wdosx) TARGET_EXAMPLEDIRS_TESTS=1 endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_EXAMPLEDIRS_TESTS=1 +endif ifeq ($(FULL_TARGET),i386-emx) TARGET_EXAMPLEDIRS_TESTS=1 endif