From cf021e58d2728eb70554f44e210a54cd87cc2ecd Mon Sep 17 00:00:00 2001 From: vincents Date: Wed, 2 May 2007 09:12:37 +0000 Subject: [PATCH] IDE: added -dEnableFakeMethods for win64 to the makefiles git-svn-id: trunk@11047 - --- ide/Makefile | 128 ++++++++++++++++++++++++++--------------------- ide/Makefile.fpc | 6 +++ 2 files changed, 77 insertions(+), 57 deletions(-) diff --git a/ide/Makefile b/ide/Makefile index 08c35b0ff8..763eed37e6 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/02/13] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/03/28] # 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -228,7 +228,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif -PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) override PACKAGE_NAME=lazaruside override PACKAGE_VERSION=0.9b RCPP?=$(firstword $(strip $(subst /,$(PATHSEP),$(wildcard $(addsuffix /cpp$(SRCEXEEXT),$(SEARCHPATH)))))) @@ -275,6 +275,10 @@ LCL_PLATFORM=win32 LAZARUS_OPT+= -WG BIG_IDE_OPTIONS+= -WG endif +ifneq ($(findstring $(OS_TARGET),win64),) +LAZARUS_OPT+= -dEnableFakeMethods +BIG_IDE_OPTIONS+= -dEnableFakeMethods +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=lazarus startlazarus lazbuild endif @@ -425,6 +429,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lazarus startlazarus lazbuild endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lazarus startlazarus lazbuild +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_PROGRAMS+=lazarus startlazarus lazbuild endif @@ -578,6 +585,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -734,6 +744,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_OPTIONS+=-gl endif @@ -887,6 +900,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images endif @@ -1040,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -1193,6 +1212,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=.. endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_TARGETDIR+=.. +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_TARGETDIR+=.. endif @@ -1346,6 +1368,9 @@ endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET) endif @@ -2151,15 +2176,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_NETDB=1 -REQUIRE_PACKAGES_WINUNITS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2202,8 +2226,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2238,8 +2262,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -2247,8 +2271,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2272,8 +2296,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2307,8 +2331,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -2316,8 +2340,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -2337,8 +2361,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2346,8 +2370,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -2405,8 +2429,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -2414,8 +2438,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -2439,8 +2463,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2448,8 +2472,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2490,8 +2514,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2499,8 +2523,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2525,8 +2549,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2534,8 +2558,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2587,8 +2611,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2628,11 +2652,10 @@ ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_NETDB=1 -REQUIRE_PACKAGES_WINUNITS=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2640,8 +2663,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2666,8 +2689,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2687,8 +2710,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2696,8 +2719,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2705,8 +2728,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2714,8 +2737,8 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2734,14 +2757,31 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),powerpc64-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_FCL=1 +REQUIRE_PACKAGES_REGEXPR=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),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_REGEXPR=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3133,32 +3173,6 @@ ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif endif -ifdef REQUIRE_PACKAGES_WINUNITS -PACKAGEDIR_WINUNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_WINUNITS),) -ifneq ($(wildcard $(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)),) -UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX) -else -UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_WINUNITS)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(FPCMADE) -endif -else -PACKAGEDIR_WINUNITS= -UNITDIR_WINUNITS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_WINUNITS),) -UNITDIR_WINUNITS:=$(firstword $(UNITDIR_WINUNITS)) -else -UNITDIR_WINUNITS= -endif -endif -ifdef UNITDIR_WINUNITS -override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(CPU_TARGET) endif diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index 98e92eb996..a82a34a9d3 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -115,6 +115,12 @@ LAZARUS_OPT+= -WG BIG_IDE_OPTIONS+= -WG endif +# define EnableFakeMethods for win64 +ifneq ($(findstring $(OS_TARGET),win64),) +LAZARUS_OPT+= -dEnableFakeMethods +BIG_IDE_OPTIONS+= -dEnableFakeMethods +endif + #----------------------------------------------------------------------------- [rules] .PHONY: ide idepkg bigide starter lazbuilder all clean cleanide purge