diff options
| author | laksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-06-25 15:28:59 +0000 |
|---|---|---|
| committer | laksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-06-25 15:28:59 +0000 |
| commit | 610bf77730199bbcb2a28d28d2457efb7a8d4bda (patch) | |
| tree | 67ee6d9fac7c6094e29939f65852c5e21d681e5c /avr32new | |
| parent | ff01c318afdc1bcdfc0ddba53e8a1c5aa32cb1a3 (diff) | |
| download | fpc-610bf77730199bbcb2a28d28d2457efb7a8d4bda.tar.gz | |
Regenerated makefiles to support avr32-embedded
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/laksen@17827 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'avr32new')
244 files changed, 47854 insertions, 3930 deletions
diff --git a/avr32new/Makefile b/avr32new/Makefile index 47fb0a809b..b683acfe76 100644 --- a/avr32new/Makefile +++ b/avr32new/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/05] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: help -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -324,6 +324,9 @@ endif ifeq ($(CPU_TARGET),armeb) PPSUF=arm endif +ifeq ($(CPU_TARGET),avr32) +PPSUF=avr32 +endif ifdef CROSSCOMPILE PPPRE=ppcross else @@ -583,6 +586,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=compiler rtl utils packages ide installer endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=compiler rtl utils packages ide installer +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1470,7 +1476,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2356,6 +2362,14 @@ TARGET_DIRS_PACKAGES=1 TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_COMPILER=1 +TARGET_DIRS_RTL=1 +TARGET_DIRS_UTILS=1 +TARGET_DIRS_PACKAGES=1 +TARGET_DIRS_IDE=1 +TARGET_DIRS_INSTALLER=1 +endif ifdef TARGET_DIRS_COMPILER compiler_all: $(MAKE) -C compiler all diff --git a/avr32new/compiler/Makefile b/avr32new/compiler/Makefile index bf99ee3236..82c837bc18 100644 --- a/avr32new/compiler/Makefile +++ b/avr32new/compiler/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/14] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -290,7 +290,7 @@ endif override PACKAGE_NAME=compiler override PACKAGE_VERSION=2.5.1 unexport FPC_VERSION FPC_COMPILERINFO -CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr +CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr avr32 ALLTARGETS=$(CYCLETARGETS) ifdef ALPHA PPC_TARGET=alpha @@ -325,6 +325,9 @@ endif ifdef MIPSEL PPC_TARGET=mipsel endif +ifdef AVR32 +PPC_TARGET=avr32 +endif ifndef PPC_TARGET PPC_TARGET=$(CPU_TARGET) endif @@ -381,6 +384,9 @@ endif ifeq ($(CPC_TARGET),mipsel) CPUSUF=mipsel endif +ifeq ($(CPC_TARGET),avr32) +CPUSUF=avr32 +endif NOCPUDEF=1 MSGFILE=msg/error$(FPCLANG).msg SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))) @@ -628,6 +634,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=utils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=utils +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=pp endif @@ -817,6 +826,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=pp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=pp +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) @@ -1007,6 +1019,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(CPC_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1196,6 +1211,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1385,6 +1403,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1574,6 +1595,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2539,6 +2563,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2688,7 +2715,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3350,6 +3377,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_UTILS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_UTILS=1 +endif ifdef TARGET_DIRS_UTILS utils_all: $(MAKE) -C utils all @@ -3526,7 +3556,10 @@ insdatx86 : $(COMPILER_UNITTARGETDIR) x86/x86ins.dat insdatarm : arm/armins.dat $(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmins.pp cd arm && ../utils/mkarmins$(SRCEXEEXT) -insdat: insdatx86 insdatarm +insdatavr32 : avr32/avr32ins.dat + $(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkavr32ins.pp + cd avr32 && ../utils/mkavr32ins$(SRCEXEEXT) +insdat: insdatx86 insdatarm insdatavr32 regdatarm : arm/armreg.dat $(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmreg.pp cd arm && ../utils/mkarmreg$(SRCEXEEXT) diff --git a/avr32new/compiler/utils/Makefile b/avr32new/compiler/utils/Makefile index bcb47a504b..1e436a3911 100644 --- a/avr32new/compiler/utils/Makefile +++ b/avr32new/compiler/utils/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/15] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -288,193 +288,196 @@ FPCFPMAKE=$(FPC) endif endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove fpcsubst mkarmins mkx86ins mkavr32ins endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=ppu crc usubst @@ -665,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=ppu crc usubst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=ppu crc usubst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=.. @@ -855,6 +861,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=.. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=.. +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=.. endif @@ -1044,6 +1053,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=.. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=.. +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -2011,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2160,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/ide/Makefile b/avr32new/ide/Makefile index 7753a1c101..ea88c8d751 100644 --- a/avr32new/ide/Makefile +++ b/avr32new/ide/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ide override PACKAGE_VERSION=2.5.1 ifndef PPC_TARGET @@ -429,6 +452,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=compiler endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=compiler +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=compiler endif @@ -504,6 +530,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=compiler endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=compiler +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fp endif @@ -615,6 +644,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fp endif @@ -690,6 +722,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fp +endif override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -803,6 +838,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Sg +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Sg endif @@ -878,6 +916,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Sg +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1255,6 +1296,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2027,6 +2073,15 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_CHM=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +REQUIRE_PACKAGES_GDBINT=1 +REQUIRE_PACKAGES_REGEXPR=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_CHM=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -2265,6 +2320,15 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_CHM=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +REQUIRE_PACKAGES_GDBINT=1 +REQUIRE_PACKAGES_REGEXPR=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_CHM=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2273,6 +2337,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2290,6 +2363,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FV PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2299,6 +2375,15 @@ UNITDIR_FV=$(PACKAGEDIR_FV)/units/$(TARGETSUFFIX) else UNITDIR_FV=$(PACKAGEDIR_FV) endif +ifneq ($(wildcard $(PACKAGEDIR_FV)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FV)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE) @@ -2316,6 +2401,9 @@ endif ifdef UNITDIR_FV override COMPILER_UNITDIR+=$(UNITDIR_FV) endif +ifdef UNITDIR_FPMAKE_FV +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FV) +endif endif ifdef REQUIRE_PACKAGES_GDBINT PACKAGEDIR_GDBINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gdbint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2325,6 +2413,15 @@ UNITDIR_GDBINT=$(PACKAGEDIR_GDBINT)/units/$(TARGETSUFFIX) else UNITDIR_GDBINT=$(PACKAGEDIR_GDBINT) endif +ifneq ($(wildcard $(PACKAGEDIR_GDBINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GDBINT=$(PACKAGEDIR_GDBINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GDBINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GDBINT=$(PACKAGEDIR_GDBINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GDBINT=$(PACKAGEDIR_GDBINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GDBINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GDBINT) $(FPCMADE) @@ -2342,6 +2439,9 @@ endif ifdef UNITDIR_GDBINT override COMPILER_UNITDIR+=$(UNITDIR_GDBINT) endif +ifdef UNITDIR_FPMAKE_GDBINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GDBINT) +endif endif ifdef REQUIRE_PACKAGES_REGEXPR PACKAGEDIR_REGEXPR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2351,6 +2451,15 @@ UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(TARGETSUFFIX) else UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR) endif +ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_REGEXPR)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_REGEXPR) $(FPCMADE) @@ -2368,6 +2477,9 @@ endif ifdef UNITDIR_REGEXPR override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR) endif +ifdef UNITDIR_FPMAKE_REGEXPR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_REGEXPR) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2377,6 +2489,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2394,6 +2515,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2403,6 +2527,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2420,6 +2553,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2429,6 +2565,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2446,6 +2591,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_CHM PACKAGEDIR_CHM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /chm/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2455,6 +2603,15 @@ UNITDIR_CHM=$(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX) else UNITDIR_CHM=$(PACKAGEDIR_CHM) endif +ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CHM)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CHM) $(FPCMADE) @@ -2472,6 +2629,9 @@ endif ifdef UNITDIR_CHM override COMPILER_UNITDIR+=$(UNITDIR_CHM) endif +ifdef UNITDIR_FPMAKE_CHM +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CHM) +endif endif ifdef REQUIRE_PACKAGES_GRAPH PACKAGEDIR_GRAPH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /graph/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2481,6 +2641,15 @@ UNITDIR_GRAPH=$(PACKAGEDIR_GRAPH)/units/$(TARGETSUFFIX) else UNITDIR_GRAPH=$(PACKAGEDIR_GRAPH) endif +ifneq ($(wildcard $(PACKAGEDIR_GRAPH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GRAPH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GRAPH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GRAPH) $(FPCMADE) @@ -2498,6 +2667,9 @@ endif ifdef UNITDIR_GRAPH override COMPILER_UNITDIR+=$(UNITDIR_GRAPH) endif +ifdef UNITDIR_FPMAKE_GRAPH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GRAPH) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2507,6 +2679,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2524,6 +2705,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2636,7 +2820,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3027,6 +3211,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3225,6 +3410,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_DIRS_COMPILER=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_COMPILER=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_COMPILER=1 endif @@ -3300,6 +3488,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_COMPILER=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_COMPILER=1 +endif ifdef TARGET_DIRS_COMPILER compiler_all: $(MAKE) -C compiler all diff --git a/avr32new/ide/compiler/Makefile b/avr32new/ide/compiler/Makefile index 18e0a87dce..84b4c22cf7 100644 --- a/avr32new/ide/compiler/Makefile +++ b/avr32new/ide/compiler/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ide PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ide/Makefile.fpc,$(PACKAGESDIR)))))) COMPILERDIR=$(FPCDIR)/compiler @@ -402,6 +425,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=compunit endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=compunit +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=compunit endif @@ -477,6 +503,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=compunit endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=compunit +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Ur -dNOCATCH @@ -589,6 +618,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Ur -dNOCATCH +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif @@ -664,6 +696,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Ur -dNOCATCH endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Ur -dNOCATCH +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -775,6 +810,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif @@ -850,6 +888,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -961,6 +1002,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif @@ -1036,6 +1080,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1382,6 +1429,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1918,6 +1970,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1993,6 +2048,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2001,6 +2059,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2018,6 +2085,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2130,7 +2200,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2421,6 +2491,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/installer/Makefile b/avr32new/installer/Makefile index 138ba87660..93eaf5d0d7 100644 --- a/avr32new/installer/Makefile +++ b/avr32new/installer/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=installer override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -422,6 +445,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=scroll insthelp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=scroll insthelp +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=scroll insthelp endif @@ -497,6 +523,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=scroll insthelp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=scroll insthelp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=installer.pas endif @@ -645,6 +674,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=../ide endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=../ide +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=../ide endif @@ -720,6 +752,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../ide endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=../ide +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1066,6 +1101,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1676,6 +1716,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +REQUIRE_PACKAGES_UNZIP=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1801,6 +1846,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +REQUIRE_PACKAGES_UNZIP=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1809,6 +1859,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1826,6 +1885,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FV PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1835,6 +1897,15 @@ UNITDIR_FV=$(PACKAGEDIR_FV)/units/$(TARGETSUFFIX) else UNITDIR_FV=$(PACKAGEDIR_FV) endif +ifneq ($(wildcard $(PACKAGEDIR_FV)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FV)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE) @@ -1852,6 +1923,9 @@ endif ifdef UNITDIR_FV override COMPILER_UNITDIR+=$(UNITDIR_FV) endif +ifdef UNITDIR_FPMAKE_FV +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FV) +endif endif ifdef REQUIRE_PACKAGES_UNZIP PACKAGEDIR_UNZIP:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /unzip/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1861,6 +1935,15 @@ UNITDIR_UNZIP=$(PACKAGEDIR_UNZIP)/units/$(TARGETSUFFIX) else UNITDIR_UNZIP=$(PACKAGEDIR_UNZIP) endif +ifneq ($(wildcard $(PACKAGEDIR_UNZIP)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNZIP=$(PACKAGEDIR_UNZIP)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNZIP)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNZIP=$(PACKAGEDIR_UNZIP)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNZIP=$(PACKAGEDIR_UNZIP) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNZIP)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNZIP) $(FPCMADE) @@ -1878,6 +1961,9 @@ endif ifdef UNITDIR_UNZIP override COMPILER_UNITDIR+=$(UNITDIR_UNZIP) endif +ifdef UNITDIR_FPMAKE_UNZIP +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNZIP) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1990,7 +2076,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2375,6 +2461,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/Makefile b/avr32new/packages/Makefile index 7541587b27..d7f6c6a752 100644 --- a/avr32new/packages/Makefile +++ b/avr32new/packages/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/17] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -476,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg fpvectorial fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad gdbm tcl syslog libcurl opengl opencl cairo gtk1 gtk2 librsvg a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 fcl-extra zorba imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd22 pxlib numlib gmp libsee ptc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg fpvectorial +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifdef REQUIRE_UNITSDIR @@ -1364,7 +1367,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -4882,6 +4885,33 @@ TARGET_DIRS_GMP=1 TARGET_DIRS_LIBSEE=1 TARGET_DIRS_PTC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_HASH=1 +TARGET_DIRS_PASJPEG=1 +TARGET_DIRS_PASZLIB=1 +TARGET_DIRS_FPMKUNIT=1 +TARGET_DIRS_FCL-XML=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-FPCUNIT=1 +TARGET_DIRS_FCL-JSON=1 +TARGET_DIRS_FCL-JS=1 +TARGET_DIRS_FCL-PROCESS=1 +TARGET_DIRS_UNZIP=1 +TARGET_DIRS_REGEXPR=1 +TARGET_DIRS_CHM=1 +TARGET_DIRS_FCL-RES=1 +TARGET_DIRS_LIBGD=1 +TARGET_DIRS_SYMBOLIC=1 +TARGET_DIRS_BZIP2=1 +TARGET_DIRS_HERMES=1 +TARGET_DIRS_FPPKG=1 +TARGET_DIRS_FPVECTORIAL=1 +endif ifdef TARGET_DIRS_HASH hash_all: $(MAKE) -C hash all diff --git a/avr32new/packages/a52/Makefile b/avr32new/packages/a52/Makefile index a38c53e832..acf134bb53 100644 --- a/avr32new/packages/a52/Makefile +++ b/avr32new/packages/a52/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=a52 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=a52 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=a52 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=a52 endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=a52 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=a52 +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/amunits/Makefile b/avr32new/packages/amunits/Makefile index 025fd31006..d33368cee7 100644 --- a/avr32new/packages/amunits/Makefile +++ b/avr32new/packages/amunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=amunits override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/aspell/Makefile b/avr32new/packages/aspell/Makefile index 1319d84fd4..d0a8da7f8b 100644 --- a/avr32new/packages/aspell/Makefile +++ b/avr32new/packages/aspell/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=aspell override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=aspell aspelldyn spellcheck endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=aspell aspelldyn spellcheck +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=aspell aspelldyn spellcheck endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=aspell aspelldyn spellcheck endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=aspell aspelldyn spellcheck +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/bfd/Makefile b/avr32new/packages/bfd/Makefile index 18ffcace5b..29946509b6 100644 --- a/avr32new/packages/bfd/Makefile +++ b/avr32new/packages/bfd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=bfd override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=bfd endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=bfd +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=bfd endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=bfd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=bfd +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/bzip2/Makefile b/avr32new/packages/bzip2/Makefile index e0e5650567..bf5af07e32 100644 --- a/avr32new/packages/bzip2/Makefile +++ b/avr32new/packages/bzip2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=bzip2 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=bzip2comn bzip2 bzip2stream endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=bzip2comn bzip2 bzip2stream +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=bzip2comn bzip2 bzip2stream endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=bzip2comn bzip2 bzip2stream endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=bzip2comn bzip2 bzip2stream +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/cairo/Makefile b/avr32new/packages/cairo/Makefile index 472b5eab8e..6fd03f8456 100644 --- a/avr32new/packages/cairo/Makefile +++ b/avr32new/packages/cairo/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=cairo override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=cairo cairoft endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=cairo cairoft +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=cairo cairoft cairoxlib endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=cairo cairoft cairoxlib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=cairo cairoft +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1942,6 +1988,14 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2158,6 +2212,14 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2166,6 +2228,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2183,6 +2254,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2192,6 +2266,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -2209,6 +2292,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2218,6 +2304,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2235,6 +2330,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2244,6 +2342,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2261,6 +2368,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2270,6 +2380,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2287,6 +2406,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2296,6 +2418,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2313,6 +2444,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2322,6 +2456,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2339,6 +2482,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2348,6 +2494,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2365,6 +2520,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2477,7 +2635,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2860,6 +3018,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/cdrom/Makefile b/avr32new/packages/cdrom/Makefile index be160668c9..722d4d862e 100644 --- a/avr32new/packages/cdrom/Makefile +++ b/avr32new/packages/cdrom/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=cdrom override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=cdrom discid fpcddb endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=cdrom discid fpcddb +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=cdrom discid fpcddb endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=cdrom discid fpcddb endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=cdrom discid fpcddb +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=major lincd endif @@ -593,6 +622,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -668,6 +700,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -780,6 +815,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -855,6 +893,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -966,6 +1007,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1041,6 +1085,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1387,6 +1434,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1923,6 +1975,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1998,6 +2053,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2006,6 +2064,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2023,6 +2090,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2135,7 +2205,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2530,6 +2600,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2728,6 +2799,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2803,6 +2877,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/cdrom/examples/Makefile b/avr32new/packages/cdrom/examples/Makefile index 3d3eba6056..33cfe801f3 100644 --- a/avr32new/packages/cdrom/examples/Makefile +++ b/avr32new/packages/cdrom/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=getdiscid showcds endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=getdiscid showcds endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=getdiscid showcds +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=getdiscid showcds endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=getdiscid showcds endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=getdiscid showcds +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_CDROM=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_CDROM=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_CDROM=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_CDROM=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_CDROM=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_CDROM PACKAGEDIR_CDROM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cdrom/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_CDROM=$(PACKAGEDIR_CDROM)/units/$(TARGETSUFFIX) else UNITDIR_CDROM=$(PACKAGEDIR_CDROM) endif +ifneq ($(wildcard $(PACKAGEDIR_CDROM)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CDROM=$(PACKAGEDIR_CDROM)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CDROM)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CDROM=$(PACKAGEDIR_CDROM)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CDROM=$(PACKAGEDIR_CDROM) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CDROM)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CDROM) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_CDROM override COMPILER_UNITDIR+=$(UNITDIR_CDROM) endif +ifdef UNITDIR_FPMAKE_CDROM +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CDROM) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/chm/Makefile b/avr32new/packages/chm/Makefile index b1271d53ae..1e92820dc7 100644 --- a/avr32new/packages/chm/Makefile +++ b/avr32new/packages/chm/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=chm override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=chmcmd chmls endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=chmcmd chmls +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=chmcmd chmls endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=chmcmd chmls endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=chmcmd chmls +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2011,6 +2063,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2149,6 +2206,11 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2157,6 +2219,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2174,6 +2245,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2183,6 +2257,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2200,6 +2283,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2209,6 +2295,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2226,6 +2321,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2235,6 +2333,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2252,6 +2359,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2261,6 +2371,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2278,6 +2397,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2390,7 +2512,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2790,6 +2912,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/cocoaint/Makefile b/avr32new/packages/cocoaint/Makefile index c9558935d6..7210246f84 100644 --- a/avr32new/packages/cocoaint/Makefile +++ b/avr32new/packages/cocoaint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=cocoaint override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=CocoaAll WebKit CoreData endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=CocoaAll WebKit CoreData +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=CocoaAll WebKit CoreData endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=CocoaAll WebKit CoreData endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=CocoaAll WebKit CoreData +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=AnonClassDefinitionsQuartzcore AnonClassDefinitionsWebkit +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1744,6 +1790,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UNIVINT=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 @@ -1844,6 +1894,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UNIVINT=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1852,6 +1906,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1869,6 +1932,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1878,6 +1944,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1895,6 +1970,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2007,7 +2085,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2384,6 +2462,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/dbus/Makefile b/avr32new/packages/dbus/Makefile index 6e4324b857..96e3dc01e7 100644 --- a/avr32new/packages/dbus/Makefile +++ b/avr32new/packages/dbus/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=dbus override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=dbus endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=dbus +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dbus endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=dbus endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=dbus +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/dbus/examples/Makefile b/avr32new/packages/dbus/examples/Makefile index c81acd70b4..23996b73f1 100644 --- a/avr32new/packages/dbus/examples/Makefile +++ b/avr32new/packages/dbus/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=busexample endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=busexample endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=busexample +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=busexample endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=busexample endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=busexample +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_DBUS=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_DBUS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_DBUS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_DBUS PACKAGEDIR_DBUS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /dbus/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_DBUS=$(PACKAGEDIR_DBUS)/units/$(TARGETSUFFIX) else UNITDIR_DBUS=$(PACKAGEDIR_DBUS) endif +ifneq ($(wildcard $(PACKAGEDIR_DBUS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_DBUS=$(PACKAGEDIR_DBUS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_DBUS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_DBUS=$(PACKAGEDIR_DBUS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_DBUS=$(PACKAGEDIR_DBUS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_DBUS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_DBUS) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_DBUS override COMPILER_UNITDIR+=$(UNITDIR_DBUS) endif +ifdef UNITDIR_FPMAKE_DBUS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_DBUS) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/dts/Makefile b/avr32new/packages/dts/Makefile index 3c8b0151dc..89e12ccd38 100644 --- a/avr32new/packages/dts/Makefile +++ b/avr32new/packages/dts/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=dts override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=dts endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=dts +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dts endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=dts endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=dts +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fastcgi/Makefile b/avr32new/packages/fastcgi/Makefile index 9f6ad22bdf..039357343e 100644 --- a/avr32new/packages/fastcgi/Makefile +++ b/avr32new/packages/fastcgi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -1518,6 +1518,13 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1819,7 +1826,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fcl-async/Makefile b/avr32new/packages/fcl-async/Makefile index a0a2ecf85a..d8ce641408 100644 --- a/avr32new/packages/fcl-async/Makefile +++ b/avr32new/packages/fcl-async/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-async override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=libasync fpasync endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=libasync fpasync +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=libasync fpasync endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=libasync fpasync endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=libasync fpasync +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/unix @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src src/unix endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/unix endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src src/unix endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-base/Makefile b/avr32new/packages/fcl-base/Makefile index 6aab015007..f1dd079fbc 100644 --- a/avr32new/packages/fcl-base/Makefile +++ b/avr32new/packages/fcl-base/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -107,37 +107,25 @@ FPC=$(PP) endif endif ifndef FPC -DETERMINE_NATIVE_COMPILER=1 -else -ifdef CROSSCOMPILE -ifndef FPCFPMAKE -DETERMINE_NATIVE_COMPILER=1 -endif -endif -endif -ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPCNATIVE:=$(shell $(FPCPROG) -PB) +FPC:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPCNATIVE)),) -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPC)),) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPCNATIVE))),) -FPCNATIVE:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPC))),) +FPC:=$(firstword $(FPCPROG)) endif endif else -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif endif -ifndef FPC -FPC=$(FPCNATIVE) -endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) FOUNDFPC:=$(strip $(wildcard $(FPC))) @@ -279,7 +267,16 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F ifndef FPCFPMAKE ifdef CROSSCOMPILE ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) -FPCFPMAKE:=$(FPCNATIVE) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif else FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) FPMAKE_SKIP_CONFIG=-n @@ -288,9 +285,6 @@ export FPMAKE_SKIP_CONFIG endif else FPCFPMAKE=$(FPC) -FPMAKE_SKIP_CONFIG=-n -export FPCFPMAKE -export FPMAKE_SKIP_CONFIG endif endif override PACKAGE_NAME=fcl-base @@ -490,6 +484,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils fpexprpars ascii85 fptemplate fpmimetypes syncobjs fptimer endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils fpexprpars ascii85 fptemplate fpmimetypes +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif @@ -679,6 +676,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol +endif ifeq ($(FULL_TARGET),i386-win32) override INSTALL_FILES+=src/win/fclel.res endif @@ -875,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif @@ -1064,6 +1067,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1253,6 +1259,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2224,6 +2233,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2411,7 +2423,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fcl-db/Makefile b/avr32new/packages/fcl-db/Makefile index 83be2eb79b..13ed3aab8a 100644 --- a/avr32new/packages/fcl-db/Makefile +++ b/avr32new/packages/fcl-db/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/24] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/dbase src/sqlite src/paradox src/export src/datadict src/codegen endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/dbase src/sqlite src/paradox src/export src/datadict src/codegen endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1016,6 +1051,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1713,6 +1753,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 @@ -1912,6 +1956,10 @@ REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_FCL-BASE),) @@ -1920,6 +1968,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1937,6 +1994,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1946,6 +2006,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -1963,6 +2032,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1972,6 +2044,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -1989,6 +2070,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1998,6 +2082,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -2015,6 +2108,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2024,6 +2120,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -2041,6 +2146,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2050,6 +2158,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -2067,6 +2184,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2076,6 +2196,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -2093,6 +2222,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifdef REQUIRE_PACKAGES_ORACLE PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2102,6 +2234,15 @@ UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) else UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) endif +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ORACLE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) @@ -2119,6 +2260,9 @@ endif ifdef UNITDIR_ORACLE override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) endif +ifdef UNITDIR_FPMAKE_ORACLE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2128,6 +2272,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -2145,6 +2298,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_PXLIB PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2154,6 +2310,15 @@ UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) else UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PXLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) @@ -2171,6 +2336,9 @@ endif ifdef UNITDIR_PXLIB override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) endif +ifdef UNITDIR_FPMAKE_PXLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PXLIB) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2180,6 +2348,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2197,6 +2374,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2309,7 +2489,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2609,6 +2789,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3037,6 +3218,13 @@ TARGET_DIRS_SRC/SQLDB=1 TARGET_DIRS_SRC/BASE=1 TARGET_DIRS_SRC/SQL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_SRC/SDF=1 +TARGET_DIRS_SRC/MEMDS=1 +TARGET_DIRS_SRC/SQLDB=1 +TARGET_DIRS_SRC/BASE=1 +TARGET_DIRS_SRC/SQL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_SRC/SDF=1 TARGET_DIRS_SRC/MEMDS=1 @@ -3285,6 +3473,13 @@ TARGET_DIRS_SRC/EXPORT=1 TARGET_DIRS_SRC/DATADICT=1 TARGET_DIRS_SRC/CODEGEN=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_SRC/SDF=1 +TARGET_DIRS_SRC/MEMDS=1 +TARGET_DIRS_SRC/SQLDB=1 +TARGET_DIRS_SRC/BASE=1 +TARGET_DIRS_SRC/SQL=1 +endif ifdef TARGET_DIRS_SRC/SDF src/sdf_all: $(MAKE) -C src/sdf all diff --git a/avr32new/packages/fcl-db/src/base/Makefile b/avr32new/packages/fcl-db/src/base/Makefile index d39bf947a5..c531d680dd 100644 --- a/avr32new/packages/fcl-db/src/base/Makefile +++ b/avr32new/packages/fcl-db/src/base/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db override PACKAGE_VERSION=2.5.1 PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) @@ -378,6 +401,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader endif @@ -453,6 +479,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader endif @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../dbase endif @@ -937,6 +978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=../dbase endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=../dbase +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=../dbase endif @@ -1012,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../dbase endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=../dbase +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1389,6 +1436,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2012,6 +2064,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2150,6 +2207,11 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2158,6 +2220,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2175,6 +2246,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2184,6 +2258,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2201,6 +2284,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2210,6 +2296,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2227,6 +2322,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2236,6 +2334,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2253,6 +2360,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2262,6 +2372,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2279,6 +2398,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2391,7 +2513,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2688,6 +2810,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/codegen/Makefile b/avr32new/packages/fcl-db/src/codegen/Makefile index 8117083c8b..31f3f36fe7 100644 --- a/avr32new/packages/fcl-db/src/codegen/Makefile +++ b/avr32new/packages/fcl-db/src/codegen/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1747,6 +1793,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1850,6 +1900,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1858,6 +1912,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1875,6 +1938,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1884,6 +1950,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1901,6 +1976,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1910,6 +1988,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1927,6 +2014,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2039,7 +2129,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2330,6 +2420,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/datadict/Makefile b/avr32new/packages/fcl-db/src/datadict/Makefile index 8f26de0fa2..7dacddf455 100644 --- a/avr32new/packages/fcl-db/src/datadict/Makefile +++ b/avr32new/packages/fcl-db/src/datadict/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1915,6 +1961,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2127,6 +2178,11 @@ REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_POSTGRES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2135,6 +2191,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2152,6 +2217,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2161,6 +2229,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2178,6 +2255,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2187,6 +2267,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2204,6 +2293,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2213,6 +2305,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2230,6 +2331,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2239,6 +2343,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -2256,6 +2369,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2265,6 +2381,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -2282,6 +2407,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifdef REQUIRE_PACKAGES_ORACLE PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2291,6 +2419,15 @@ UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) else UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) endif +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ORACLE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) @@ -2308,6 +2445,9 @@ endif ifdef UNITDIR_ORACLE override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) endif +ifdef UNITDIR_FPMAKE_ORACLE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2317,6 +2457,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -2334,6 +2483,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2343,6 +2495,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -2360,6 +2521,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2369,6 +2533,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -2386,6 +2559,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2395,6 +2571,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2412,6 +2597,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2524,7 +2712,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2821,6 +3009,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/dbase/Makefile b/avr32new/packages/fcl-db/src/dbase/Makefile index 46def6f973..e37fe2ab7d 100644 --- a/avr32new/packages/fcl-db/src/dbase/Makefile +++ b/avr32new/packages/fcl-db/src/dbase/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(OS_TARGET),win32) @@ -385,6 +408,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=dbf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=dbf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dbf endif @@ -460,6 +486,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=dbf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=dbf +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testdbf endif @@ -571,6 +600,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=testdbf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=testdbf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=testdbf endif @@ -646,6 +678,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=testdbf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=testdbf +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=dbf_collate 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 @@ -757,6 +792,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=dbf_collate 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-wii) +override CLEAN_UNITS+=dbf_collate 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_collate 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 @@ -832,6 +870,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=dbf_collate 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),avr32-embedded) +override CLEAN_UNITS+=dbf_collate 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_collate 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 @@ -943,6 +984,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override INSTALL_UNITS+=dbf_collate 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-wii) +override INSTALL_UNITS+=dbf_collate 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 INSTALL_UNITS+=dbf_collate 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 @@ -1018,6 +1062,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override INSTALL_UNITS+=dbf_collate 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),avr32-embedded) +override INSTALL_UNITS+=dbf_collate 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 @@ -1130,6 +1177,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 -Sh endif @@ -1205,6 +1255,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 -Sh endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 -Sh +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1551,6 +1604,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2127,6 +2185,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2230,6 +2292,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2238,6 +2304,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2255,6 +2330,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2264,6 +2342,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2281,6 +2368,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2290,6 +2380,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2307,6 +2406,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2419,7 +2521,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2728,6 +2830,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/export/Makefile b/avr32new/packages/fcl-db/src/export/Makefile index 65673ab954..a6bdb942bf 100644 --- a/avr32new/packages/fcl-db/src/export/Makefile +++ b/avr32new/packages/fcl-db/src/export/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpstdexports +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1747,6 +1793,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1850,6 +1900,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1858,6 +1912,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1875,6 +1938,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1884,6 +1950,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1901,6 +1976,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1910,6 +1988,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1927,6 +2014,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2039,7 +2129,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2330,6 +2420,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/memds/Makefile b/avr32new/packages/fcl-db/src/memds/Makefile index 7779092fe8..9a49258168 100644 --- a/avr32new/packages/fcl-db/src/memds/Makefile +++ b/avr32new/packages/fcl-db/src/memds/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=memds endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=memds +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=memds endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=memds endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=memds +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=memds endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=memds endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=memds +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=memds endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=memds endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=memds +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=testpop testopen testld testcp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=testpop testopen testld testcp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=testpop testopen testld testcp endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=testpop testopen testld testcp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=testpop testopen testld testcp +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1747,6 +1793,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1850,6 +1900,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1858,6 +1912,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1875,6 +1938,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1884,6 +1950,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1901,6 +1976,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1910,6 +1988,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1927,6 +2014,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2039,7 +2129,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2348,6 +2438,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/paradox/Makefile b/avr32new/packages/fcl-db/src/paradox/Makefile index bf65931a7a..20983e927d 100644 --- a/avr32new/packages/fcl-db/src/paradox/Makefile +++ b/avr32new/packages/fcl-db/src/paradox/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=paradox endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=paradox +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=paradox endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=paradox endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=paradox +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=paradox endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=paradox endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=paradox +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=paradox endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=paradox endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=paradox +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -985,6 +1020,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1598,6 +1638,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PXLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 @@ -1726,6 +1771,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PXLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1734,6 +1784,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1751,6 +1810,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PXLIB PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1760,6 +1822,15 @@ UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) else UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PXLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) @@ -1777,6 +1848,9 @@ endif ifdef UNITDIR_PXLIB override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) endif +ifdef UNITDIR_FPMAKE_PXLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PXLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1786,6 +1860,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1803,6 +1886,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1812,6 +1898,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1829,6 +1924,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1941,7 +2039,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2232,6 +2330,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sdf/Makefile b/avr32new/packages/fcl-db/src/sdf/Makefile index 2e275c8294..8e768a25ee 100644 --- a/avr32new/packages/fcl-db/src/sdf/Makefile +++ b/avr32new/packages/fcl-db/src/sdf/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=sdfdata endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=sdfdata +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=sdfdata endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=sdfdata endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=sdfdata +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=testsdf testfix endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=testsdf testfix endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=testsdf testfix +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=testsdf testfix endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=testsdf testfix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=testsdf testfix +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -985,6 +1020,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1561,6 +1601,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1664,6 +1708,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1672,6 +1720,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1689,6 +1746,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1698,6 +1758,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1715,6 +1784,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1724,6 +1796,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1741,6 +1822,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1853,7 +1937,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2162,6 +2246,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sql/Makefile b/avr32new/packages/fcl-db/src/sql/Makefile index 09d5c68811..0ca4d1c847 100644 --- a/avr32new/packages/fcl-db/src/sql/Makefile +++ b/avr32new/packages/fcl-db/src/sql/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../dbase endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=../dbase endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=../dbase +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=../dbase endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../dbase endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=../dbase +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1933,6 +1985,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2036,6 +2092,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2044,6 +2104,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2061,6 +2130,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2070,6 +2142,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2087,6 +2168,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2096,6 +2180,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2113,6 +2206,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2225,7 +2321,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2516,6 +2612,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/Makefile b/avr32new/packages/fcl-db/src/sqldb/Makefile index 8878382c26..513cad5312 100644 --- a/avr32new/packages/fcl-db/src/sqldb/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -464,6 +487,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=sqldb endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=sqldb +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=sqldb endif @@ -539,6 +565,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=sqldb endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=sqldb +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=sqldb endif @@ -650,6 +679,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=sqldb endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=sqldb +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=sqldb endif @@ -725,6 +757,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=sqldb endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=sqldb +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -837,6 +872,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -912,6 +950,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1289,6 +1330,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2008,6 +2054,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2222,6 +2273,11 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_ORACLE=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2230,6 +2286,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2247,6 +2312,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2256,6 +2324,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2273,6 +2350,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2282,6 +2362,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2299,6 +2388,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2308,6 +2400,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2325,6 +2426,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2334,6 +2438,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -2351,6 +2464,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2360,6 +2476,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -2377,6 +2502,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2386,6 +2514,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -2403,6 +2540,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2412,6 +2552,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -2429,6 +2578,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifdef REQUIRE_PACKAGES_ORACLE PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2438,6 +2590,15 @@ UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) else UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) endif +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ORACLE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) @@ -2455,6 +2616,9 @@ endif ifdef UNITDIR_ORACLE override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) endif +ifdef UNITDIR_FPMAKE_ORACLE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2464,6 +2628,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -2481,6 +2654,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2490,6 +2666,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2507,6 +2692,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2619,7 +2807,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2916,6 +3104,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/interbase/Makefile b/avr32new/packages/fcl-db/src/sqldb/interbase/Makefile index 61897fffb4..39184e9d44 100644 --- a/avr32new/packages/fcl-db/src/sqldb/interbase/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/interbase/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ibconnection endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ibconnection +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ibconnection endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ibconnection endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ibconnection +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1016,6 +1051,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1676,6 +1716,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_IBASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_IBASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1839,6 +1885,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_IBASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_IBASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1847,6 +1899,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1864,6 +1925,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1873,6 +1937,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1890,6 +1963,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1899,6 +1975,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -1916,6 +2001,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1925,6 +2013,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -1942,6 +2039,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1951,6 +2051,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -1968,6 +2077,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1977,6 +2089,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1994,6 +2115,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2106,7 +2230,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2403,6 +2527,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/mysql/Makefile b/avr32new/packages/fcl-db/src/sqldb/mysql/Makefile index 17fc458b38..1f0e6c615b 100644 --- a/avr32new/packages/fcl-db/src/sqldb/mysql/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/mysql/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1862,6 +1908,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_MYSQL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2025,6 +2077,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_MYSQL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_MYSQL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2033,6 +2091,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2050,6 +2117,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2059,6 +2129,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2076,6 +2155,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2085,6 +2167,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2102,6 +2193,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2111,6 +2205,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2128,6 +2231,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2137,6 +2243,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -2154,6 +2269,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2163,6 +2281,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2180,6 +2307,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2292,7 +2422,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2589,6 +2719,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/odbc/Makefile b/avr32new/packages/fcl-db/src/sqldb/odbc/Makefile index 69ed15f43c..972e27f2fe 100644 --- a/avr32new/packages/fcl-db/src/sqldb/odbc/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/odbc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=odbcconn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=odbcconn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=odbcconn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=odbcconn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=odbcconn +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1016,6 +1051,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1676,6 +1716,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_ODBC=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_ODBC=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1839,6 +1885,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_ODBC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_ODBC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1847,6 +1899,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1864,6 +1925,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1873,6 +1937,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1890,6 +1963,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1899,6 +1975,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -1916,6 +2001,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1925,6 +2013,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -1942,6 +2039,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1951,6 +2051,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -1968,6 +2077,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1977,6 +2089,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1994,6 +2115,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2106,7 +2230,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2403,6 +2527,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/oracle/Makefile b/avr32new/packages/fcl-db/src/sqldb/oracle/Makefile index 21d4880551..cfc09af6b2 100644 --- a/avr32new/packages/fcl-db/src/sqldb/oracle/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/oracle/Makefile @@ -1,2703 +1,2834 @@ -# -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] -# -default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux -BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku -LIMIT83fs = go32v2 os2 emx watcom -OSNeedsComspecToRunBatch = go32v2 watcom -FORCE: -.PHONY: FORCE -override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) -ifneq ($(findstring darwin,$(OSTYPE)),) -inUnix=1 #darwin -SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) -else -ifeq ($(findstring ;,$(PATH)),) -inUnix=1 -SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) -else -SEARCHPATH:=$(subst ;, ,$(PATH)) -endif -endif -SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE)))) -PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) -ifeq ($(PWD),) -PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) -ifeq ($(PWD),) -$(error You need the GNU utils package to use this Makefile) -else -PWD:=$(firstword $(PWD)) -SRCEXEEXT= -endif -else -PWD:=$(firstword $(PWD)) -SRCEXEEXT=.exe -endif -ifndef inUnix -ifeq ($(OS),Windows_NT) -inWinNT=1 -else -ifdef OS2_SHELL -inOS2=1 -endif -endif -else -ifneq ($(findstring cygdrive,$(PATH)),) -inCygWin=1 -endif -endif -ifdef inUnix -SRCBATCHEXT=.sh -else -ifdef inOS2 -SRCBATCHEXT=.cmd -else -SRCBATCHEXT=.bat -endif -endif -ifdef COMSPEC -ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) -ifndef RUNBATCH -RUNBATCH=$(COMSPEC) /C -endif -endif -endif -ifdef inUnix -PATHSEP=/ -else -PATHSEP:=$(subst /,\,/) -ifdef inCygWin -PATHSEP=/ -endif -endif -ifdef PWD -BASEDIR:=$(subst \,/,$(shell $(PWD))) -ifdef inCygWin -ifneq ($(findstring /cygdrive/,$(BASEDIR)),) -BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR)) -BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR))) -BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR)) -endif -endif -else -BASEDIR=. -endif -ifdef inOS2 -ifndef ECHO -ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(ECHO),) -ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(ECHO),) -ECHO=echo -else -ECHO:=$(firstword $(ECHO)) -endif -else -ECHO:=$(firstword $(ECHO)) -endif -endif -export ECHO -endif -override DEFAULT_FPCDIR=../../../../.. -ifndef FPC -ifdef PP -FPC=$(PP) -endif -endif -ifndef FPC -FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) -ifneq ($(FPCPROG),) -FPCPROG:=$(firstword $(FPCPROG)) -ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) -else -FPC:=$(shell $(FPCPROG) -PB) -endif -ifneq ($(findstring Error,$(FPC)),) -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) -else -ifeq ($(strip $(wildcard $(FPC))),) -FPC:=$(firstword $(FPCPROG)) -endif -endif -else -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) -endif -endif -override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) -override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) -FOUNDFPC:=$(strip $(wildcard $(FPC))) -ifeq ($(FOUNDFPC),) -FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH)))) -ifeq ($(FOUNDFPC),) -$(error Compiler $(FPC) not found) -endif -endif -ifndef FPC_COMPILERINFO -FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO) -endif -ifndef FPC_VERSION -FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO)) -endif -export FPC FPC_VERSION FPC_COMPILERINFO -unexport CHECKDEPEND ALLDEPENDENCIES -ifndef CPU_TARGET -ifdef CPU_TARGET_DEFAULT -CPU_TARGET=$(CPU_TARGET_DEFAULT) -endif -endif -ifndef OS_TARGET -ifdef OS_TARGET_DEFAULT -OS_TARGET=$(OS_TARGET_DEFAULT) -endif -endif -ifneq ($(words $(FPC_COMPILERINFO)),5) -FPC_COMPILERINFO+=$(shell $(FPC) -iSP) -FPC_COMPILERINFO+=$(shell $(FPC) -iTP) -FPC_COMPILERINFO+=$(shell $(FPC) -iSO) -FPC_COMPILERINFO+=$(shell $(FPC) -iTO) -endif -ifndef CPU_SOURCE -CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO)) -endif -ifndef CPU_TARGET -CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO)) -endif -ifndef OS_SOURCE -OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO)) -endif -ifndef OS_TARGET -OS_TARGET:=$(word 5,$(FPC_COMPILERINFO)) -endif -FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) -FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifeq ($(CPU_TARGET),armeb) -ARCH=arm -override FPCOPT+=-Cb -else -ifeq ($(CPU_TARGET),armel) -ARCH=arm -override FPCOPT+=-CaEABI -else -ARCH=$(CPU_TARGET) -endif -endif -ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) -TARGETSUFFIX=$(OS_TARGET) -SOURCESUFFIX=$(OS_SOURCE) -else -TARGETSUFFIX=$(FULL_TARGET) -SOURCESUFFIX=$(FULL_SOURCE) -endif -ifneq ($(FULL_TARGET),$(FULL_SOURCE)) -CROSSCOMPILE=1 -endif -ifeq ($(findstring makefile,$(MAKECMDGOALS)),) -ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),) -$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first) -endif -endif -ifneq ($(findstring $(OS_TARGET),$(BSDs)),) -BSDhier=1 -endif -ifeq ($(OS_TARGET),linux) -linuxHier=1 -endif -export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE -ifdef FPCDIR -override FPCDIR:=$(subst \,/,$(FPCDIR)) -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR=wrong -endif -else -override FPCDIR=wrong -endif -ifdef DEFAULT_FPCDIR -ifeq ($(FPCDIR),wrong) -override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR)) -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR=wrong -endif -endif -endif -ifeq ($(FPCDIR),wrong) -ifdef inUnix -override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION) -ifeq ($(wildcard $(FPCDIR)/units),) -override FPCDIR=/usr/lib/fpc/$(FPC_VERSION) -endif -else -override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH)))))) -override FPCDIR:=$(FPCDIR)/.. -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR:=$(FPCDIR)/.. -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR:=$(BASEDIR) -ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) -override FPCDIR=c:/pp -endif -endif -endif -endif -endif -ifndef CROSSBINDIR -CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) -endif -ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) -ifeq ($(OS_SOURCE),darwin) -DARWIN2DARWIN=1 -endif -endif -ifndef BINUTILSPREFIX -ifndef CROSSBINDIR -ifdef CROSSCOMPILE -ifndef DARWIN2DARWIN -BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- -endif -endif -endif -endif -UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) -ifeq ($(UNITSDIR),) -UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) -endif -PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) -override PACKAGE_NAME=fcl-db -PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=oracleconnection -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=oracleconnection -endif -override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2 -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 -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2 -endif -ifdef REQUIRE_UNITSDIR -override UNITSDIR+=$(REQUIRE_UNITSDIR) -endif -ifdef REQUIRE_PACKAGESDIR -override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR) -endif -ifdef ZIPINSTALL -ifneq ($(findstring $(OS_TARGET),$(UNIXs)),) -UNIXHier=1 -endif -else -ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),) -UNIXHier=1 -endif -endif -ifndef INSTALL_PREFIX -ifdef PREFIX -INSTALL_PREFIX=$(PREFIX) -endif -endif -ifndef INSTALL_PREFIX -ifdef UNIXHier -INSTALL_PREFIX=/usr/local -else -ifdef INSTALL_FPCPACKAGE -INSTALL_BASEDIR:=/pp -else -INSTALL_BASEDIR:=/$(PACKAGE_NAME) -endif -endif -endif -export INSTALL_PREFIX -ifdef INSTALL_FPCSUBDIR -export INSTALL_FPCSUBDIR -endif -ifndef DIST_DESTDIR -DIST_DESTDIR:=$(BASEDIR) -endif -export DIST_DESTDIR -ifndef COMPILER_UNITTARGETDIR -ifdef PACKAGEDIR_MAIN -COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX) -else -COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX) -endif -endif -ifndef COMPILER_TARGETDIR -COMPILER_TARGETDIR=. -endif -ifndef INSTALL_BASEDIR -ifdef UNIXHier -ifdef INSTALL_FPCPACKAGE -INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION) -else -INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME) -endif -else -INSTALL_BASEDIR:=$(INSTALL_PREFIX) -endif -endif -ifndef INSTALL_BINDIR -ifdef UNIXHier -INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin -else -INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin -ifdef INSTALL_FPCPACKAGE -ifdef CROSSCOMPILE -ifdef CROSSINSTALL -INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX) -else -INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX) -endif -else -INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX) -endif -endif -endif -endif -ifndef INSTALL_UNITDIR -INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX) -ifdef INSTALL_FPCPACKAGE -ifdef PACKAGE_NAME -INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME) -endif -endif -endif -ifndef INSTALL_LIBDIR -ifdef UNIXHier -INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib -else -INSTALL_LIBDIR:=$(INSTALL_UNITDIR) -endif -endif -ifndef INSTALL_SOURCEDIR -ifdef UNIXHier -ifdef BSDhier -SRCPREFIXDIR=share/src -else -ifdef linuxHier -SRCPREFIXDIR=share/src -else -SRCPREFIXDIR=src -endif -endif -ifdef INSTALL_FPCPACKAGE -ifdef INSTALL_FPCSUBDIR -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) -else -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) -endif -else -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -endif -else -ifdef INSTALL_FPCPACKAGE -ifdef INSTALL_FPCSUBDIR -INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) -else -INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME) -endif -else -INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source -endif -endif -endif -ifndef INSTALL_DOCDIR -ifdef UNIXHier -ifdef BSDhier -DOCPREFIXDIR=share/doc -else -ifdef linuxHier -DOCPREFIXDIR=share/doc -else -DOCPREFIXDIR=doc -endif -endif -ifdef INSTALL_FPCPACKAGE -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) -else -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -endif -else -ifdef INSTALL_FPCPACKAGE -INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME) -else -INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc -endif -endif -endif -ifndef INSTALL_EXAMPLEDIR -ifdef UNIXHier -ifdef INSTALL_FPCPACKAGE -ifdef BSDhier -INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) -else -ifdef linuxHier -INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples -else -INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME) -endif -endif -else -ifdef BSDhier -INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -else -ifdef linuxHier -INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -else -INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -endif -endif -endif -else -ifdef INSTALL_FPCPACKAGE -INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) -else -INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples -endif -endif -endif -ifndef INSTALL_DATADIR -INSTALL_DATADIR=$(INSTALL_BASEDIR) -endif -ifndef INSTALL_SHAREDDIR -INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib -endif -ifdef CROSSCOMPILE -ifndef CROSSBINDIR -CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX)) -ifeq ($(CROSSBINDIR),) -CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$(FULL_SOURCE)) -endif -endif -else -CROSSBINDIR= -endif -ifeq ($(OS_SOURCE),linux) -ifndef GCCLIBDIR -ifeq ($(CPU_TARGET),i386) -ifneq ($(findstring x86_64,$(shell uname -a)),) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) -endif -endif -endif -ifeq ($(CPU_TARGET),powerpc64) -ifeq ($(BINUTILSPREFIX),) -GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`) -endif -endif -endif -ifndef GCCLIBDIR -CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) -ifneq ($(CROSSGCC),) -GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`) -endif -endif -ifndef OTHERLIBDIR -OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') -endif -endif -ifdef inUnix -ifeq ($(OS_SOURCE),netbsd) -OTHERLIBDIR+=/usr/pkg/lib -endif -export GCCLIBDIR OTHERLIB -endif -BATCHEXT=.bat -LOADEREXT=.as -EXEEXT=.exe -PPLEXT=.ppl -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.so -SHAREDLIBPREFIX=libfp -STATICLIBPREFIX=libp -IMPORTLIBPREFIX=libimp -RSTEXT=.rst -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),go32v1) -STATICLIBPREFIX= -SHORTSUFFIX=v1 -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -OEXT=.obj -ASMEXT=.asm -SHAREDLIBEXT=.dll -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -AOUTEXT=.out -STATICLIBPREFIX= -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),emx) -BATCHEXT=.cmd -AOUTEXT=.out -STATICLIBPREFIX= -SHAREDLIBEXT=.dll -SHORTSUFFIX=emx -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),morphos) -EXEEXT= -SHAREDLIBEXT=.library -SHORTSUFFIX=mos -endif -ifeq ($(OS_TARGET),atari) -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),haiku) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=hai -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -EXEEXT=.nlm -STATICLIBPREFIX= -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -EXEEXT=.nlm -STATICLIBPREFIX= -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=dwn -endif -ifeq ($(OS_TARGET),gba) -EXEEXT=.gba -SHAREDLIBEXT=.so -SHORTSUFFIX=gba -endif -ifeq ($(OS_TARGET),symbian) -SHAREDLIBEXT=.dll -SHORTSUFFIX=symbian -endif -ifeq ($(OS_TARGET),NativeNT) -SHAREDLIBEXT=.dll -SHORTSUFFIX=nativent -endif -else -ifeq ($(OS_TARGET),go32v1) -PPUEXT=.pp1 -OEXT=.o1 -ASMEXT=.s1 -SMARTEXT=.sl1 -STATICLIBEXT=.a1 -SHAREDLIBEXT=.so1 -STATICLIBPREFIX= -SHORTSUFFIX=v1 -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -PPUEXT=.ppw -OEXT=.ow -ASMEXT=.sw -SMARTEXT=.slw -STATICLIBEXT=.aw -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -PPUEXT=.ppo -ASMEXT=.so2 -OEXT=.oo2 -AOUTEXT=.out -SMARTEXT=.sl2 -STATICLIBPREFIX= -STATICLIBEXT=.ao2 -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),atari) -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -endif -ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) -FPCMADE=fpcmade.$(SHORTSUFFIX) -ZIPSUFFIX=$(SHORTSUFFIX) -ZIPCROSSPREFIX= -ZIPSOURCESUFFIX=src -ZIPEXAMPLESUFFIX=exm -else -FPCMADE=fpcmade.$(TARGETSUFFIX) -ZIPSOURCESUFFIX=.source -ZIPEXAMPLESUFFIX=.examples -ifdef CROSSCOMPILE -ZIPSUFFIX=.$(SOURCESUFFIX) -ZIPCROSSPREFIX=$(TARGETSUFFIX)- -else -ZIPSUFFIX=.$(TARGETSUFFIX) -ZIPCROSSPREFIX= -endif -endif -ifndef ECHO -ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(ECHO),) -ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(ECHO),) -ECHO= __missing_command_ECHO -else -ECHO:=$(firstword $(ECHO)) -endif -else -ECHO:=$(firstword $(ECHO)) -endif -endif -export ECHO -ifndef DATE -DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(DATE),) -DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(DATE),) -DATE= __missing_command_DATE -else -DATE:=$(firstword $(DATE)) -endif -else -DATE:=$(firstword $(DATE)) -endif -endif -export DATE -ifndef GINSTALL -GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(GINSTALL),) -GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(GINSTALL),) -GINSTALL= __missing_command_GINSTALL -else -GINSTALL:=$(firstword $(GINSTALL)) -endif -else -GINSTALL:=$(firstword $(GINSTALL)) -endif -endif -export GINSTALL -ifndef CPPROG -CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(CPPROG),) -CPPROG= __missing_command_CPPROG -else -CPPROG:=$(firstword $(CPPROG)) -endif -endif -export CPPROG -ifndef RMPROG -RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(RMPROG),) -RMPROG= __missing_command_RMPROG -else -RMPROG:=$(firstword $(RMPROG)) -endif -endif -export RMPROG -ifndef MVPROG -MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(MVPROG),) -MVPROG= __missing_command_MVPROG -else -MVPROG:=$(firstword $(MVPROG)) -endif -endif -export MVPROG -ifndef MKDIRPROG -MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(MKDIRPROG),) -MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(MKDIRPROG),) -MKDIRPROG= __missing_command_MKDIRPROG -else -MKDIRPROG:=$(firstword $(MKDIRPROG)) -endif -else -MKDIRPROG:=$(firstword $(MKDIRPROG)) -endif -endif -export MKDIRPROG -ifndef ECHOREDIR -ifndef inUnix -ECHOREDIR=echo -else -ECHOREDIR=$(ECHO) -endif -endif -ifndef COPY -COPY:=$(CPPROG) -fp -endif -ifndef COPYTREE -COPYTREE:=$(CPPROG) -Rfp -endif -ifndef MKDIRTREE -MKDIRTREE:=$(MKDIRPROG) -p -endif -ifndef MOVE -MOVE:=$(MVPROG) -f -endif -ifndef DEL -DEL:=$(RMPROG) -f -endif -ifndef DELTREE -DELTREE:=$(RMPROG) -rf -endif -ifndef INSTALL -ifdef inUnix -INSTALL:=$(GINSTALL) -c -m 644 -else -INSTALL:=$(COPY) -endif -endif -ifndef INSTALLEXE -ifdef inUnix -INSTALLEXE:=$(GINSTALL) -c -m 755 -else -INSTALLEXE:=$(COPY) -endif -endif -ifndef MKDIR -MKDIR:=$(GINSTALL) -m 755 -d -endif -export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR -ifndef PPUMOVE -PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(PPUMOVE),) -PPUMOVE= __missing_command_PPUMOVE -else -PPUMOVE:=$(firstword $(PPUMOVE)) -endif -endif -export PPUMOVE -ifndef FPCMAKE -FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(FPCMAKE),) -FPCMAKE= __missing_command_FPCMAKE -else -FPCMAKE:=$(firstword $(FPCMAKE)) -endif -endif -export FPCMAKE -ifndef ZIPPROG -ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(ZIPPROG),) -ZIPPROG= __missing_command_ZIPPROG -else -ZIPPROG:=$(firstword $(ZIPPROG)) -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 -LDNAME=$(BINUTILSPREFIX)ld -ARNAME=$(BINUTILSPREFIX)ar -RCNAME=$(BINUTILSPREFIX)rc -ifneq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),win32) -ifeq ($(CROSSBINDIR),) -ASNAME=asw -LDNAME=ldw -ARNAME=arw -endif -endif -endif -ifndef ASPROG -ifdef CROSSBINDIR -ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) -else -ASPROG=$(ASNAME) -endif -endif -ifndef LDPROG -ifdef CROSSBINDIR -LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT) -else -LDPROG=$(LDNAME) -endif -endif -ifndef RCPROG -ifdef CROSSBINDIR -RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT) -else -RCPROG=$(RCNAME) -endif -endif -ifndef ARPROG -ifdef CROSSBINDIR -ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT) -else -ARPROG=$(ARNAME) -endif -endif -AS=$(ASPROG) -LD=$(LDPROG) -RC=$(RCPROG) -AR=$(ARPROG) -PPAS=ppas$(SRCBATCHEXT) -ifdef inUnix -LDCONFIG=ldconfig -else -LDCONFIG= -endif -ifdef DATE -DATESTR:=$(shell $(DATE) +%Y%m%d) -else -DATESTR= -endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:=1 -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG -ZIPOPT=-9 -ZIPEXT=.zip -ifeq ($(USETAR),bz2) -TAROPT=vj -TAREXT=.tar.bz2 -else -TAROPT=vz -TAREXT=.tar.gz -endif -override REQUIRE_PACKAGES=rtl fcl-xml oracle -ifeq ($(FULL_TARGET),i386-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_UNIVINT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_ORACLE=1 -endif -ifdef REQUIRE_PACKAGES_RTL -PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_RTL),) -ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),) -UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) -else -UNITDIR_RTL=$(PACKAGEDIR_RTL) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE) -endif -else -PACKAGEDIR_RTL= -UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_RTL),) -UNITDIR_RTL:=$(firstword $(UNITDIR_RTL)) -else -UNITDIR_RTL= -endif -endif -ifdef UNITDIR_RTL -override COMPILER_UNITDIR+=$(UNITDIR_RTL) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_ICONVENC -PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ICONVENC),) -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),) -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) -else -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ICONVENC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE) -endif -else -PACKAGEDIR_ICONVENC= -UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ICONVENC),) -UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC)) -else -UNITDIR_ICONVENC= -endif -endif -ifdef UNITDIR_ICONVENC -override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-XML -PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-XML),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-XML)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-XML)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-XML= -UNITDIR_FCL-XML:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-XML),) -UNITDIR_FCL-XML:=$(firstword $(UNITDIR_FCL-XML)) -else -UNITDIR_FCL-XML= -endif -endif -ifdef UNITDIR_FCL-XML -override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) -endif -endif -ifdef REQUIRE_PACKAGES_ORACLE -PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ORACLE),) -ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),) -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) -else -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ORACLE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE) -endif -else -PACKAGEDIR_ORACLE= -UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ORACLE),) -UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE)) -else -UNITDIR_ORACLE= -endif -endif -ifdef UNITDIR_ORACLE -override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) -endif -endif -ifdef REQUIRE_PACKAGES_UNIVINT -PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_UNIVINT),) -ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)),) -UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) -else -UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_UNIVINT)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_UNIVINT)/$(FPCMADE) -endif -else -PACKAGEDIR_UNIVINT= -UNITDIR_UNIVINT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /univint/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_UNIVINT),) -UNITDIR_UNIVINT:=$(firstword $(UNITDIR_UNIVINT)) -else -UNITDIR_UNIVINT= -endif -endif -ifdef UNITDIR_UNIVINT -override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) -endif -endif -ifndef NOCPUDEF -override FPCOPTDEF=$(ARCH) -endif -ifneq ($(OS_TARGET),$(OS_SOURCE)) -override FPCOPT+=-T$(OS_TARGET) -endif -ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(ARCH) -endif -ifeq ($(OS_SOURCE),openbsd) -override FPCOPT+=-FD$(NEW_BINUTILS_PATH) -endif -ifndef CROSSBOOTSTRAP -ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) -endif -ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-Xr$(RLINKPATH) -endif -endif -ifdef UNITDIR -override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) -endif -ifdef LIBDIR -override FPCOPT+=$(addprefix -Fl,$(LIBDIR)) -endif -ifdef OBJDIR -override FPCOPT+=$(addprefix -Fo,$(OBJDIR)) -endif -ifdef INCDIR -override FPCOPT+=$(addprefix -Fi,$(INCDIR)) -endif -ifdef LINKSMART -override FPCOPT+=-XX -endif -ifdef CREATESMART -override FPCOPT+=-CX -endif -ifdef DEBUG -override FPCOPT+=-gl -override FPCOPTDEF+=DEBUG -endif -ifdef RELEASE -ifneq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(CPU_TARGET),i386) -FPCCPUOPT:=-OG2p3 -endif -ifeq ($(CPU_TARGET),powerpc) -FPCCPUOPT:=-O1r -endif -else -FPCCPUOPT:=-O2 -endif -override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n -override FPCOPTDEF+=RELEASE -endif -ifdef STRIP -override FPCOPT+=-Xs -endif -ifdef OPTIMIZE -override FPCOPT+=-O2 -endif -ifdef VERBOSE -override FPCOPT+=-vwni -endif -ifdef COMPILER_OPTIONS -override FPCOPT+=$(COMPILER_OPTIONS) -endif -ifdef COMPILER_UNITDIR -override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR)) -endif -ifdef COMPILER_LIBRARYDIR -override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR)) -endif -ifdef COMPILER_OBJECTDIR -override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR)) -endif -ifdef COMPILER_INCLUDEDIR -override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR)) -endif -ifdef CROSSBINDIR -override FPCOPT+=-FD$(CROSSBINDIR) -endif -ifdef COMPILER_TARGETDIR -override FPCOPT+=-FE$(COMPILER_TARGETDIR) -ifeq ($(COMPILER_TARGETDIR),.) -override TARGETDIRPREFIX= -else -override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/ -endif -endif -ifdef COMPILER_UNITTARGETDIR -override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR) -ifeq ($(COMPILER_UNITTARGETDIR),.) -override UNITTARGETDIRPREFIX= -else -override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/ -endif -else -ifdef COMPILER_TARGETDIR -override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR) -override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) -endif -endif -ifdef CREATESHARED -override FPCOPT+=-Cg -ifeq ($(CPU_TARGET),i386) -override FPCOPT+=-Aas -endif -endif -ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) -ifeq ($(CPU_TARGET),x86_64) -override FPCOPT+=-Cg -endif -endif -endif -ifdef LINKSHARED -endif -ifdef GCCLIBDIR -override FPCOPT+=-Fl$(GCCLIBDIR) -endif -ifdef OTHERLIBDIR -override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) -endif -ifdef OPT -override FPCOPT+=$(OPT) -endif -ifdef FPCOPTDEF -override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) -endif -ifdef CFGFILE -override FPCOPT+=@$(CFGFILE) -endif -ifdef USEENV -override FPCEXTCMD:=$(FPCOPT) -override FPCOPT:=!FPCEXTCMD -export FPCEXTCMD -endif -override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) -override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) -ifneq ($(AFULL_TARGET),$(AFULL_SOURCE)) -override ACROSSCOMPILE=1 -endif -ifdef ACROSSCOMPILE -override FPCOPT+=$(CROSSOPT) -endif -override COMPILER:=$(FPC) $(FPCOPT) -ifeq (,$(findstring -s ,$(COMPILER))) -EXECPPAS= -else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -ifdef RUNBATCH -EXECPPAS:=@$(RUNBATCH) $(PPAS) -else -EXECPPAS:=@$(PPAS) -endif -endif -endif -.PHONY: fpc_units -ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) -override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) -override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) -endif -fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) -ifdef TARGET_RSTS -override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) -override CLEANRSTFILES+=$(RSTFILES) -endif -.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared -$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET) - @$(ECHOREDIR) Compiled > $(FPCMADE) -fpc_all: $(FPCMADE) -fpc_smart: - $(MAKE) all LINKSMART=1 CREATESMART=1 -fpc_debug: - $(MAKE) all DEBUG=1 -fpc_release: - $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res -$(COMPILER_UNITTARGETDIR): - $(MKDIRTREE) $(COMPILER_UNITTARGETDIR) -$(COMPILER_TARGETDIR): - $(MKDIRTREE) $(COMPILER_TARGETDIR) -%$(PPUEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(PPUEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pp - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.pas - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.lpr - $(COMPILER) $< - $(EXECPPAS) -%$(EXEEXT): %.dpr - $(COMPILER) $< - $(EXECPPAS) -%.res: %.rc - windres -i $< -o $@ -vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.inc $(COMPILER_INCLUDEDIR) -vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) -vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) -.PHONY: fpc_shared -override INSTALLTARGET+=fpc_shared_install -ifndef SHARED_LIBVERSION -SHARED_LIBVERSION=$(FPC_VERSION) -endif -ifndef SHARED_LIBNAME -SHARED_LIBNAME=$(PACKAGE_NAME) -endif -ifndef SHARED_FULLNAME -SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT) -endif -ifndef SHARED_LIBUNITS -SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS) -override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS)) -endif -fpc_shared: -ifdef HASSHAREDLIB - $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 -ifneq ($(SHARED_BUILD),n) - $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -endif -else - @$(ECHO) Shared Libraries not supported -endif -fpc_shared_install: -ifneq ($(SHARED_BUILD),n) -ifneq ($(SHARED_LIBUNITS),) -ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),) - $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR) -endif -endif -endif -.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall -ifdef INSTALL_UNITS -override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) -endif -ifdef INSTALL_BUILDUNIT -override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) -endif -ifdef INSTALLPPUFILES -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) -ifneq ($(UNITTARGETDIRPREFIX),) -override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) -override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) -endif -override INSTALL_CREATEPACKAGEFPC=1 -endif -ifdef INSTALLEXEFILES -ifneq ($(TARGETDIRPREFIX),) -override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES))) -endif -endif -fpc_install: all $(INSTALLTARGET) -ifdef INSTALLEXEFILES - $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif - $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) -endif -ifdef INSTALL_CREATEPACKAGEFPC -ifdef FPCMAKE -ifdef PACKAGE_VERSION -ifneq ($(wildcard Makefile.fpc),) - $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) Package.fpc $(INSTALL_UNITDIR) -endif -endif -endif -endif -ifdef INSTALLPPUFILES - $(MKDIR) $(INSTALL_UNITDIR) - $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) -ifneq ($(INSTALLPPULINKFILES),) - $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR) -endif -ifneq ($(wildcard $(LIB_FULLNAME)),) - $(MKDIR) $(INSTALL_LIBDIR) - $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR) -ifdef inUnix - ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME) -endif -endif -endif -ifdef INSTALL_FILES - $(MKDIR) $(INSTALL_DATADIR) - $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR) -endif -fpc_sourceinstall: distclean - $(MKDIR) $(INSTALL_SOURCEDIR) - $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) -ifdef HASEXAMPLES - $(MKDIR) $(INSTALL_EXAMPLEDIR) -endif -ifdef EXAMPLESOURCEFILES - $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR) -endif -ifdef TARGET_EXAMPLEDIRS - $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) -endif -.PHONY: fpc_clean fpc_cleanall fpc_distclean -ifdef EXEFILES -override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) -endif -ifdef CLEAN_PROGRAMS -override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) -endif -ifdef CLEAN_UNITS -override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) -endif -ifdef CLEANPPUFILES -override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) -ifdef DEBUGSYMEXT -override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES)) -endif -override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) -override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) -endif -fpc_clean: $(CLEANTARGET) -ifdef CLEANEXEFILES - -$(DEL) $(CLEANEXEFILES) -endif -ifdef CLEANPPUFILES - -$(DEL) $(CLEANPPUFILES) -endif -ifneq ($(CLEANPPULINKFILES),) - -$(DEL) $(CLEANPPULINKFILES) -endif -ifdef CLEANRSTFILES - -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES)) -endif -ifdef CLEAN_FILES - -$(DEL) $(CLEAN_FILES) -endif -ifdef LIB_NAME - -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) -endif - -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) - -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) -fpc_cleanall: $(CLEANTARGET) -ifdef CLEANEXEFILES - -$(DEL) $(CLEANEXEFILES) -endif -ifdef COMPILER_UNITTARGETDIR -ifdef CLEANPPUFILES - -$(DEL) $(CLEANPPUFILES) -endif -ifneq ($(CLEANPPULINKFILES),) - -$(DEL) $(CLEANPPULINKFILES) -endif -ifdef CLEANRSTFILES - -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES)) -endif -endif -ifdef CLEAN_FILES - -$(DEL) $(CLEAN_FILES) -endif - -$(DELTREE) units - -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -ifneq ($(PPUEXT),.ppu) - -$(DEL) *.o *.ppu *.a -endif - -$(DELTREE) *$(SMARTEXT) - -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) - -$(DEL) *_ppas$(BATCHEXT) -ifdef AOUTEXT - -$(DEL) *$(AOUTEXT) -endif -ifdef DEBUGSYMEXT - -$(DEL) *$(DEBUGSYMEXT) -endif -fpc_distclean: cleanall -.PHONY: fpc_baseinfo -override INFORULES+=fpc_baseinfo -fpc_baseinfo: - @$(ECHO) - @$(ECHO) == Package info == - @$(ECHO) Package Name..... $(PACKAGE_NAME) - @$(ECHO) Package Version.. $(PACKAGE_VERSION) - @$(ECHO) - @$(ECHO) == Configuration info == - @$(ECHO) - @$(ECHO) FPC.......... $(FPC) - @$(ECHO) FPC Version.. $(FPC_VERSION) - @$(ECHO) Source CPU... $(CPU_SOURCE) - @$(ECHO) Target CPU... $(CPU_TARGET) - @$(ECHO) Source OS.... $(OS_SOURCE) - @$(ECHO) Target OS.... $(OS_TARGET) - @$(ECHO) Full Source.. $(FULL_SOURCE) - @$(ECHO) Full Target.. $(FULL_TARGET) - @$(ECHO) SourceSuffix. $(SOURCESUFFIX) - @$(ECHO) TargetSuffix. $(TARGETSUFFIX) - @$(ECHO) - @$(ECHO) == Directory info == - @$(ECHO) - @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES) - @$(ECHO) - @$(ECHO) Basedir......... $(BASEDIR) - @$(ECHO) FPCDir.......... $(FPCDIR) - @$(ECHO) CrossBinDir..... $(CROSSBINDIR) - @$(ECHO) UnitsDir........ $(UNITSDIR) - @$(ECHO) PackagesDir..... $(PACKAGESDIR) - @$(ECHO) - @$(ECHO) GCC library..... $(GCCLIBDIR) - @$(ECHO) Other library... $(OTHERLIBDIR) - @$(ECHO) - @$(ECHO) == Tools info == - @$(ECHO) - @$(ECHO) As........ $(AS) - @$(ECHO) Ld........ $(LD) - @$(ECHO) Ar........ $(AR) - @$(ECHO) Rc........ $(RC) - @$(ECHO) - @$(ECHO) Mv........ $(MVPROG) - @$(ECHO) Cp........ $(CPPROG) - @$(ECHO) Rm........ $(RMPROG) - @$(ECHO) GInstall.. $(GINSTALL) - @$(ECHO) Echo...... $(ECHO) - @$(ECHO) Shell..... $(SHELL) - @$(ECHO) Date...... $(DATE) - @$(ECHO) FPCMake... $(FPCMAKE) - @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) - @$(ECHO) Zip....... $(ZIPPROG) - @$(ECHO) - @$(ECHO) == Object info == - @$(ECHO) - @$(ECHO) Target Loaders........ $(TARGET_LOADERS) - @$(ECHO) Target Units.......... $(TARGET_UNITS) - @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS) - @$(ECHO) Target Programs....... $(TARGET_PROGRAMS) - @$(ECHO) Target Dirs........... $(TARGET_DIRS) - @$(ECHO) Target Examples....... $(TARGET_EXAMPLES) - @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS) - @$(ECHO) - @$(ECHO) Clean Units......... $(CLEAN_UNITS) - @$(ECHO) Clean Files......... $(CLEAN_FILES) - @$(ECHO) - @$(ECHO) Install Units....... $(INSTALL_UNITS) - @$(ECHO) Install Files....... $(INSTALL_FILES) - @$(ECHO) - @$(ECHO) == Install info == - @$(ECHO) - @$(ECHO) DateStr.............. $(DATESTR) - @$(ECHO) ZipName.............. $(ZIPNAME) - @$(ECHO) ZipPrefix............ $(ZIPPREFIX) - @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX) - @$(ECHO) ZipSuffix............ $(ZIPSUFFIX) - @$(ECHO) FullZipName.......... $(FULLZIPNAME) - @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE) - @$(ECHO) - @$(ECHO) Install base dir..... $(INSTALL_BASEDIR) - @$(ECHO) Install binary dir... $(INSTALL_BINDIR) - @$(ECHO) Install library dir.. $(INSTALL_LIBDIR) - @$(ECHO) Install units dir.... $(INSTALL_UNITDIR) - @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR) - @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR) - @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR) - @$(ECHO) Install data dir..... $(INSTALL_DATADIR) - @$(ECHO) - @$(ECHO) Dist destination dir. $(DIST_DESTDIR) - @$(ECHO) Dist zip name........ $(DIST_ZIPNAME) - @$(ECHO) -.PHONY: fpc_info -fpc_info: $(INFORULES) -.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \ - fpc_makefile_dirs -fpc_makefile: - $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc -fpc_makefile_sub1: -ifdef TARGET_DIRS - $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS)) -endif -ifdef TARGET_EXAMPLEDIRS - $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS)) -endif -fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) -fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 -fpc_makefiles: fpc_makefile fpc_makefile_dirs -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: -shared: fpc_shared -install: fpc_install -sourceinstall: fpc_sourceinstall -exampleinstall: fpc_exampleinstall -distinstall: -zipinstall: -zipsourceinstall: -zipexampleinstall: -zipdistinstall: -clean: fpc_clean -distclean: fpc_distclean -cleanall: fpc_cleanall -info: fpc_info -makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles -ifneq ($(wildcard fpcmake.loc),) -include fpcmake.loc -endif -.NOTPARALLEL: +#
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25]
+#
+default: all
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded
+BSDs = freebsd netbsd openbsd darwin
+UNIXs = linux $(BSDs) solaris qnx haiku
+LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
+FORCE:
+.PHONY: FORCE
+override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
+ifneq ($(findstring darwin,$(OSTYPE)),)
+inUnix=1 #darwin
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
+else
+ifeq ($(findstring ;,$(PATH)),)
+inUnix=1
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
+else
+SEARCHPATH:=$(subst ;, ,$(PATH))
+endif
+endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
+PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
+ifeq ($(PWD),)
+PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
+ifeq ($(PWD),)
+$(error You need the GNU utils package to use this Makefile)
+else
+PWD:=$(firstword $(PWD))
+SRCEXEEXT=
+endif
+else
+PWD:=$(firstword $(PWD))
+SRCEXEEXT=.exe
+endif
+ifndef inUnix
+ifeq ($(OS),Windows_NT)
+inWinNT=1
+else
+ifdef OS2_SHELL
+inOS2=1
+endif
+endif
+else
+ifneq ($(findstring cygdrive,$(PATH)),)
+inCygWin=1
+endif
+endif
+ifdef inUnix
+SRCBATCHEXT=.sh
+else
+ifdef inOS2
+SRCBATCHEXT=.cmd
+else
+SRCBATCHEXT=.bat
+endif
+endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+ifndef RUNBATCH
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
+endif
+ifdef inUnix
+PATHSEP=/
+else
+PATHSEP:=$(subst /,\,/)
+ifdef inCygWin
+PATHSEP=/
+endif
+endif
+ifdef PWD
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
+ifdef inCygWin
+ifneq ($(findstring /cygdrive/,$(BASEDIR)),)
+BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))
+BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))
+BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))
+endif
+endif
+else
+BASEDIR=.
+endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
+override DEFAULT_FPCDIR=../../../../..
+ifndef FPC
+ifdef PP
+FPC=$(PP)
+endif
+endif
+ifndef FPC
+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(FPCPROG),)
+FPCPROG:=$(firstword $(FPCPROG))
+ifneq ($(CPU_TARGET),)
+FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+else
+FPC:=$(shell $(FPCPROG) -PB)
+endif
+ifneq ($(findstring Error,$(FPC)),)
+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+else
+ifeq ($(strip $(wildcard $(FPC))),)
+FPC:=$(firstword $(FPCPROG))
+endif
+endif
+else
+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+endif
+override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
+override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
+FOUNDFPC:=$(strip $(wildcard $(FPC)))
+ifeq ($(FOUNDFPC),)
+FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))
+ifeq ($(FOUNDFPC),)
+$(error Compiler $(FPC) not found)
+endif
+endif
+ifndef FPC_COMPILERINFO
+FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
+endif
+ifndef FPC_VERSION
+FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
+endif
+export FPC FPC_VERSION FPC_COMPILERINFO
+unexport CHECKDEPEND ALLDEPENDENCIES
+ifndef CPU_TARGET
+ifdef CPU_TARGET_DEFAULT
+CPU_TARGET=$(CPU_TARGET_DEFAULT)
+endif
+endif
+ifndef OS_TARGET
+ifdef OS_TARGET_DEFAULT
+OS_TARGET=$(OS_TARGET_DEFAULT)
+endif
+endif
+ifneq ($(words $(FPC_COMPILERINFO)),5)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
+FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
+FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
+endif
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
+endif
+FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
+FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
+ifeq ($(CPU_TARGET),armeb)
+ARCH=arm
+override FPCOPT+=-Cb
+else
+ifeq ($(CPU_TARGET),armel)
+ARCH=arm
+override FPCOPT+=-CaEABI
+else
+ARCH=$(CPU_TARGET)
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+TARGETSUFFIX=$(OS_TARGET)
+SOURCESUFFIX=$(OS_SOURCE)
+else
+TARGETSUFFIX=$(FULL_TARGET)
+SOURCESUFFIX=$(FULL_SOURCE)
+endif
+ifneq ($(FULL_TARGET),$(FULL_SOURCE))
+CROSSCOMPILE=1
+endif
+ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
+ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
+$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
+endif
+endif
+ifneq ($(findstring $(OS_TARGET),$(BSDs)),)
+BSDhier=1
+endif
+ifeq ($(OS_TARGET),linux)
+linuxHier=1
+endif
+export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ifdef FPCDIR
+override FPCDIR:=$(subst \,/,$(FPCDIR))
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=wrong
+endif
+else
+override FPCDIR=wrong
+endif
+ifdef DEFAULT_FPCDIR
+ifeq ($(FPCDIR),wrong)
+override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=wrong
+endif
+endif
+endif
+ifeq ($(FPCDIR),wrong)
+ifdef inUnix
+override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
+ifeq ($(wildcard $(FPCDIR)/units),)
+override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
+endif
+else
+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+override FPCDIR:=$(FPCDIR)/..
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(FPCDIR)/..
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(BASEDIR)
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR=c:/pp
+endif
+endif
+endif
+endif
+endif
+ifndef CROSSBINDIR
+CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
+endif
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifeq ($(OS_SOURCE),darwin)
+DARWIN2DARWIN=1
+endif
+endif
+ifndef BINUTILSPREFIX
+ifndef CROSSBINDIR
+ifdef CROSSCOMPILE
+ifndef DARWIN2DARWIN
+BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
+endif
+endif
+endif
+endif
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ifeq ($(UNITSDIR),)
+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+endif
+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(FPCPROG),)
+FPCPROG:=$(firstword $(FPCPROG))
+FPCFPMAKE:=$(shell $(FPCPROG) -PB)
+ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
+FPCFPMAKE:=$(firstword $(FPCPROG))
+endif
+else
+override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
+endif
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+FPMAKE_SKIP_CONFIG=-n
+export FPCFPMAKE
+export FPMAKE_SKIP_CONFIG
+endif
+else
+FPCFPMAKE=$(FPC)
+endif
+endif
+override PACKAGE_NAME=fcl-db
+PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR))))))
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),avr32-embedded)
+override TARGET_UNITS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override TARGET_RSTS+=oracleconnection
+endif
+ifeq ($(FULL_TARGET),avr32-embedded)
+override TARGET_RSTS+=oracleconnection
+endif
+override INSTALL_FPCPACKAGE=y
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_OPTIONS+=-S2
+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
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override COMPILER_OPTIONS+=-S2
+endif
+ifeq ($(FULL_TARGET),avr32-embedded)
+override COMPILER_OPTIONS+=-S2
+endif
+ifdef REQUIRE_UNITSDIR
+override UNITSDIR+=$(REQUIRE_UNITSDIR)
+endif
+ifdef REQUIRE_PACKAGESDIR
+override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)
+endif
+ifdef ZIPINSTALL
+ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)
+UNIXHier=1
+endif
+else
+ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)
+UNIXHier=1
+endif
+endif
+ifndef INSTALL_PREFIX
+ifdef PREFIX
+INSTALL_PREFIX=$(PREFIX)
+endif
+endif
+ifndef INSTALL_PREFIX
+ifdef UNIXHier
+INSTALL_PREFIX=/usr/local
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=/pp
+else
+INSTALL_BASEDIR:=/$(PACKAGE_NAME)
+endif
+endif
+endif
+export INSTALL_PREFIX
+ifdef INSTALL_FPCSUBDIR
+export INSTALL_FPCSUBDIR
+endif
+ifndef DIST_DESTDIR
+DIST_DESTDIR:=$(BASEDIR)
+endif
+export DIST_DESTDIR
+ifndef COMPILER_UNITTARGETDIR
+ifdef PACKAGEDIR_MAIN
+COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)
+else
+COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)
+endif
+endif
+ifndef COMPILER_TARGETDIR
+COMPILER_TARGETDIR=.
+endif
+ifndef INSTALL_BASEDIR
+ifdef UNIXHier
+ifdef INSTALL_FPCPACKAGE
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
+endif
+else
+INSTALL_BASEDIR:=$(INSTALL_PREFIX)
+endif
+endif
+ifndef INSTALL_BINDIR
+ifdef UNIXHier
+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+else
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+ifdef INSTALL_FPCPACKAGE
+ifdef CROSSCOMPILE
+ifdef CROSSINSTALL
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)
+else
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
+endif
+else
+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
+endif
+endif
+endif
+endif
+ifndef INSTALL_UNITDIR
+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)
+ifdef INSTALL_FPCPACKAGE
+ifdef PACKAGE_NAME
+INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
+endif
+endif
+endif
+ifndef INSTALL_LIBDIR
+ifdef UNIXHier
+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
+else
+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
+endif
+endif
+ifndef INSTALL_SOURCEDIR
+ifdef UNIXHier
+ifdef BSDhier
+SRCPREFIXDIR=share/src
+else
+ifdef linuxHier
+SRCPREFIXDIR=share/src
+else
+SRCPREFIXDIR=src
+endif
+endif
+ifdef INSTALL_FPCPACKAGE
+ifdef INSTALL_FPCSUBDIR
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+endif
+else
+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+ifdef INSTALL_FPCSUBDIR
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
+else
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+endif
+else
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
+endif
+endif
+endif
+ifndef INSTALL_DOCDIR
+ifdef UNIXHier
+ifdef BSDhier
+DOCPREFIXDIR=share/doc
+else
+ifdef linuxHier
+DOCPREFIXDIR=share/doc
+else
+DOCPREFIXDIR=doc
+endif
+endif
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
+else
+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
+endif
+endif
+endif
+ifndef INSTALL_EXAMPLEDIR
+ifdef UNIXHier
+ifdef INSTALL_FPCPACKAGE
+ifdef BSDhier
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+else
+ifdef linuxHier
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
+endif
+endif
+else
+ifdef BSDhier
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+else
+ifdef linuxHier
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+endif
+endif
+endif
+else
+ifdef INSTALL_FPCPACKAGE
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
+else
+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
+endif
+endif
+endif
+ifndef INSTALL_DATADIR
+INSTALL_DATADIR=$(INSTALL_BASEDIR)
+endif
+ifndef INSTALL_SHAREDDIR
+INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
+endif
+ifdef CROSSCOMPILE
+ifndef CROSSBINDIR
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
+ifeq ($(CROSSBINDIR),)
+CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$(FULL_SOURCE))
+endif
+endif
+else
+CROSSBINDIR=
+endif
+ifeq ($(OS_SOURCE),linux)
+ifndef GCCLIBDIR
+ifeq ($(CPU_TARGET),i386)
+ifneq ($(findstring x86_64,$(shell uname -a)),)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
+endif
+endif
+ifeq ($(CPU_TARGET),powerpc64)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
+endif
+endif
+endif
+ifndef GCCLIBDIR
+CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(CROSSGCC),)
+GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
+endif
+endif
+ifndef OTHERLIBDIR
+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
+endif
+endif
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
+OTHERLIBDIR+=/usr/pkg/lib
+endif
+export GCCLIBDIR OTHERLIB
+endif
+BATCHEXT=.bat
+LOADEREXT=.as
+EXEEXT=.exe
+PPLEXT=.ppl
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.so
+SHAREDLIBPREFIX=libfp
+STATICLIBPREFIX=libp
+IMPORTLIBPREFIX=libimp
+RSTEXT=.rst
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),go32v1)
+STATICLIBPREFIX=
+SHORTSUFFIX=v1
+endif
+ifeq ($(OS_TARGET),go32v2)
+STATICLIBPREFIX=
+SHORTSUFFIX=dos
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),linux)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=lnx
+endif
+ifeq ($(OS_TARGET),freebsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=fbs
+endif
+ifeq ($(OS_TARGET),netbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=nbs
+endif
+ifeq ($(OS_TARGET),openbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=obs
+endif
+ifeq ($(OS_TARGET),win32)
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=w32
+endif
+ifeq ($(OS_TARGET),os2)
+BATCHEXT=.cmd
+AOUTEXT=.out
+STATICLIBPREFIX=
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=os2
+ECHO=echo
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),emx)
+BATCHEXT=.cmd
+AOUTEXT=.out
+STATICLIBPREFIX=
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=emx
+ECHO=echo
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+SHAREDLIBEXT=.library
+SHORTSUFFIX=amg
+endif
+ifeq ($(OS_TARGET),morphos)
+EXEEXT=
+SHAREDLIBEXT=.library
+SHORTSUFFIX=mos
+endif
+ifeq ($(OS_TARGET),atari)
+EXEEXT=.ttp
+SHORTSUFFIX=ata
+endif
+ifeq ($(OS_TARGET),beos)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=be
+endif
+ifeq ($(OS_TARGET),haiku)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=hai
+endif
+ifeq ($(OS_TARGET),solaris)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=sun
+endif
+ifeq ($(OS_TARGET),qnx)
+BATCHEXT=.sh
+EXEEXT=
+SHORTSUFFIX=qnx
+endif
+ifeq ($(OS_TARGET),netware)
+EXEEXT=.nlm
+STATICLIBPREFIX=
+SHORTSUFFIX=nw
+IMPORTLIBPREFIX=imp
+endif
+ifeq ($(OS_TARGET),netwlibc)
+EXEEXT=.nlm
+STATICLIBPREFIX=
+SHORTSUFFIX=nwl
+IMPORTLIBPREFIX=imp
+endif
+ifeq ($(OS_TARGET),macos)
+BATCHEXT=
+EXEEXT=
+DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
+IMPORTLIBPREFIX=imp
+endif
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=dwn
+endif
+ifeq ($(OS_TARGET),gba)
+EXEEXT=.gba
+SHAREDLIBEXT=.so
+SHORTSUFFIX=gba
+endif
+ifeq ($(OS_TARGET),symbian)
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=symbian
+endif
+ifeq ($(OS_TARGET),NativeNT)
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=nativent
+endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
+else
+ifeq ($(OS_TARGET),go32v1)
+PPUEXT=.pp1
+OEXT=.o1
+ASMEXT=.s1
+SMARTEXT=.sl1
+STATICLIBEXT=.a1
+SHAREDLIBEXT=.so1
+STATICLIBPREFIX=
+SHORTSUFFIX=v1
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),go32v2)
+STATICLIBPREFIX=
+SHORTSUFFIX=dos
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+SHORTSUFFIX=wat
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),linux)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=lnx
+endif
+ifeq ($(OS_TARGET),freebsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=fbs
+endif
+ifeq ($(OS_TARGET),netbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=nbs
+endif
+ifeq ($(OS_TARGET),openbsd)
+BATCHEXT=.sh
+EXEEXT=
+HASSHAREDLIB=1
+SHORTSUFFIX=obs
+endif
+ifeq ($(OS_TARGET),win32)
+PPUEXT=.ppw
+OEXT=.ow
+ASMEXT=.sw
+SMARTEXT=.slw
+STATICLIBEXT=.aw
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=w32
+endif
+ifeq ($(OS_TARGET),os2)
+BATCHEXT=.cmd
+PPUEXT=.ppo
+ASMEXT=.so2
+OEXT=.oo2
+AOUTEXT=.out
+SMARTEXT=.sl2
+STATICLIBPREFIX=
+STATICLIBEXT=.ao2
+SHAREDLIBEXT=.dll
+SHORTSUFFIX=os2
+ECHO=echo
+IMPORTLIBPREFIX=
+endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.library
+SHORTSUFFIX=amg
+endif
+ifeq ($(OS_TARGET),atari)
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=.ttp
+SHORTSUFFIX=ata
+endif
+ifeq ($(OS_TARGET),beos)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=be
+endif
+ifeq ($(OS_TARGET),solaris)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=sun
+endif
+ifeq ($(OS_TARGET),qnx)
+BATCHEXT=.sh
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+SHORTSUFFIX=qnx
+endif
+ifeq ($(OS_TARGET),netware)
+STATICLIBPREFIX=
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.nlm
+EXEEXT=.nlm
+SHORTSUFFIX=nw
+IMPORTLIBPREFIX=imp
+endif
+ifeq ($(OS_TARGET),netwlibc)
+STATICLIBPREFIX=
+PPUEXT=.ppu
+OEXT=.o
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.nlm
+EXEEXT=.nlm
+SHORTSUFFIX=nwl
+IMPORTLIBPREFIX=imp
+endif
+ifeq ($(OS_TARGET),macos)
+BATCHEXT=
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
+IMPORTLIBPREFIX=imp
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
+else
+FPCMADE=fpcmade.$(TARGETSUFFIX)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(SOURCESUFFIX)
+ZIPCROSSPREFIX=$(TARGETSUFFIX)-
+else
+ZIPSUFFIX=.$(TARGETSUFFIX)
+ZIPCROSSPREFIX=
+endif
+endif
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO= __missing_command_ECHO
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+ifndef DATE
+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(DATE),)
+DATE= __missing_command_DATE
+else
+DATE:=$(firstword $(DATE))
+endif
+else
+DATE:=$(firstword $(DATE))
+endif
+endif
+export DATE
+ifndef GINSTALL
+GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(GINSTALL),)
+GINSTALL= __missing_command_GINSTALL
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+else
+GINSTALL:=$(firstword $(GINSTALL))
+endif
+endif
+export GINSTALL
+ifndef CPPROG
+CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(CPPROG),)
+CPPROG= __missing_command_CPPROG
+else
+CPPROG:=$(firstword $(CPPROG))
+endif
+endif
+export CPPROG
+ifndef RMPROG
+RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(RMPROG),)
+RMPROG= __missing_command_RMPROG
+else
+RMPROG:=$(firstword $(RMPROG))
+endif
+endif
+export RMPROG
+ifndef MVPROG
+MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MVPROG),)
+MVPROG= __missing_command_MVPROG
+else
+MVPROG:=$(firstword $(MVPROG))
+endif
+endif
+export MVPROG
+ifndef MKDIRPROG
+MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MKDIRPROG),)
+MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(MKDIRPROG),)
+MKDIRPROG= __missing_command_MKDIRPROG
+else
+MKDIRPROG:=$(firstword $(MKDIRPROG))
+endif
+else
+MKDIRPROG:=$(firstword $(MKDIRPROG))
+endif
+endif
+export MKDIRPROG
+ifndef ECHOREDIR
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
+endif
+ifndef COPY
+COPY:=$(CPPROG) -fp
+endif
+ifndef COPYTREE
+COPYTREE:=$(CPPROG) -Rfp
+endif
+ifndef MKDIRTREE
+MKDIRTREE:=$(MKDIRPROG) -p
+endif
+ifndef MOVE
+MOVE:=$(MVPROG) -f
+endif
+ifndef DEL
+DEL:=$(RMPROG) -f
+endif
+ifndef DELTREE
+DELTREE:=$(RMPROG) -rf
+endif
+ifndef INSTALL
+ifdef inUnix
+INSTALL:=$(GINSTALL) -c -m 644
+else
+INSTALL:=$(COPY)
+endif
+endif
+ifndef INSTALLEXE
+ifdef inUnix
+INSTALLEXE:=$(GINSTALL) -c -m 755
+else
+INSTALLEXE:=$(COPY)
+endif
+endif
+ifndef MKDIR
+MKDIR:=$(GINSTALL) -m 755 -d
+endif
+export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
+ifndef PPUMOVE
+PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(PPUMOVE),)
+PPUMOVE= __missing_command_PPUMOVE
+else
+PPUMOVE:=$(firstword $(PPUMOVE))
+endif
+endif
+export PPUMOVE
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE= __missing_command_FPCMAKE
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
+ifndef ZIPPROG
+ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ZIPPROG),)
+ZIPPROG= __missing_command_ZIPPROG
+else
+ZIPPROG:=$(firstword $(ZIPPROG))
+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
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),win32)
+ifeq ($(CROSSBINDIR),)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
+endif
+endif
+ifndef ASPROG
+ifdef CROSSBINDIR
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
+else
+ASPROG=$(ASNAME)
+endif
+endif
+ifndef LDPROG
+ifdef CROSSBINDIR
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
+else
+LDPROG=$(LDNAME)
+endif
+endif
+ifndef RCPROG
+ifdef CROSSBINDIR
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
+else
+ARPROG=$(ARNAME)
+endif
+endif
+AS=$(ASPROG)
+LD=$(LDPROG)
+RC=$(RCPROG)
+AR=$(ARPROG)
+PPAS=ppas$(SRCBATCHEXT)
+ifdef inUnix
+LDCONFIG=ldconfig
+else
+LDCONFIG=
+endif
+ifdef DATE
+DATESTR:=$(shell $(DATE) +%Y%m%d)
+else
+DATESTR=
+endif
+ifndef UPXPROG
+ifeq ($(OS_TARGET),go32v2)
+UPXPROG:=1
+endif
+ifeq ($(OS_TARGET),win32)
+UPXPROG:=1
+endif
+ifdef UPXPROG
+UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(UPXPROG),)
+UPXPROG=
+else
+UPXPROG:=$(firstword $(UPXPROG))
+endif
+else
+UPXPROG=
+endif
+endif
+export UPXPROG
+ZIPOPT=-9
+ZIPEXT=.zip
+ifeq ($(USETAR),bz2)
+TAROPT=vj
+TAREXT=.tar.bz2
+else
+TAROPT=vz
+TAREXT=.tar.gz
+endif
+override REQUIRE_PACKAGES=rtl fcl-xml oracle
+ifeq ($(FULL_TARGET),i386-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_UNIVINT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_ICONVENC=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifeq ($(FULL_TARGET),avr32-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-XML=1
+REQUIRE_PACKAGES_ORACLE=1
+endif
+ifdef REQUIRE_PACKAGES_RTL
+PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_RTL),)
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
+else
+UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_RTL=
+UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_RTL),)
+UNITDIR_RTL:=$(firstword $(UNITDIR_RTL))
+else
+UNITDIR_RTL=
+endif
+endif
+ifdef UNITDIR_RTL
+override COMPILER_UNITDIR+=$(UNITDIR_RTL)
+endif
+ifdef UNITDIR_FPMAKE_RTL
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-BASE
+PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-BASE),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-BASE)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-BASE=
+UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-BASE),)
+UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE))
+else
+UNITDIR_FCL-BASE=
+endif
+endif
+ifdef UNITDIR_FCL-BASE
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE)
+endif
+ifdef UNITDIR_FPMAKE_FCL-BASE
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE)
+endif
+endif
+ifdef REQUIRE_PACKAGES_ICONVENC
+PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_ICONVENC),)
+ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),)
+UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)
+else
+UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_ICONVENC)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_ICONVENC=
+UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_ICONVENC),)
+UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC))
+else
+UNITDIR_ICONVENC=
+endif
+endif
+ifdef UNITDIR_ICONVENC
+override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC)
+endif
+ifdef UNITDIR_FPMAKE_ICONVENC
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC)
+endif
+endif
+ifdef REQUIRE_PACKAGES_FCL-XML
+PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FCL-XML),)
+ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)),)
+UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)
+else
+UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL-XML)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-XML)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_FCL-XML=
+UNITDIR_FCL-XML:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FCL-XML),)
+UNITDIR_FCL-XML:=$(firstword $(UNITDIR_FCL-XML))
+else
+UNITDIR_FCL-XML=
+endif
+endif
+ifdef UNITDIR_FCL-XML
+override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML)
+endif
+ifdef UNITDIR_FPMAKE_FCL-XML
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML)
+endif
+endif
+ifdef REQUIRE_PACKAGES_ORACLE
+PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_ORACLE),)
+ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),)
+UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)
+else
+UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_ORACLE)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_ORACLE=
+UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_ORACLE),)
+UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE))
+else
+UNITDIR_ORACLE=
+endif
+endif
+ifdef UNITDIR_ORACLE
+override COMPILER_UNITDIR+=$(UNITDIR_ORACLE)
+endif
+ifdef UNITDIR_FPMAKE_ORACLE
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE)
+endif
+endif
+ifdef REQUIRE_PACKAGES_UNIVINT
+PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_UNIVINT),)
+ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)),)
+UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX)
+else
+UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_UNIVINT)/$(FPCMADE):
+ $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_UNIVINT)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_UNIVINT=
+UNITDIR_UNIVINT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /univint/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_UNIVINT),)
+UNITDIR_UNIVINT:=$(firstword $(UNITDIR_UNIVINT))
+else
+UNITDIR_UNIVINT=
+endif
+endif
+ifdef UNITDIR_UNIVINT
+override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT)
+endif
+ifdef UNITDIR_FPMAKE_UNIVINT
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT)
+endif
+endif
+ifndef NOCPUDEF
+override FPCOPTDEF=$(ARCH)
+endif
+ifneq ($(OS_TARGET),$(OS_SOURCE))
+override FPCOPT+=-T$(OS_TARGET)
+endif
+ifneq ($(CPU_TARGET),$(CPU_SOURCE))
+override FPCOPT+=-P$(ARCH)
+endif
+ifeq ($(OS_SOURCE),openbsd)
+override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX)
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
+ifdef UNITDIR
+override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
+endif
+ifdef LIBDIR
+override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
+endif
+ifdef OBJDIR
+override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
+endif
+ifdef INCDIR
+override FPCOPT+=$(addprefix -Fi,$(INCDIR))
+endif
+ifdef LINKSMART
+override FPCOPT+=-XX
+endif
+ifdef CREATESMART
+override FPCOPT+=-CX
+endif
+ifdef DEBUG
+override FPCOPT+=-gl
+override FPCOPTDEF+=DEBUG
+endif
+ifdef RELEASE
+ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+endif
+ifeq ($(CPU_TARGET),powerpc)
+FPCCPUOPT:=-O1r
+endif
+else
+FPCCPUOPT:=-O2
+endif
+override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+override FPCOPTDEF+=RELEASE
+endif
+ifdef STRIP
+override FPCOPT+=-Xs
+endif
+ifdef OPTIMIZE
+override FPCOPT+=-O2
+endif
+ifdef VERBOSE
+override FPCOPT+=-vwni
+endif
+ifdef COMPILER_OPTIONS
+override FPCOPT+=$(COMPILER_OPTIONS)
+endif
+ifdef COMPILER_UNITDIR
+override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))
+endif
+ifdef COMPILER_LIBRARYDIR
+override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))
+endif
+ifdef COMPILER_OBJECTDIR
+override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))
+endif
+ifdef COMPILER_INCLUDEDIR
+override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))
+endif
+ifdef CROSSBINDIR
+override FPCOPT+=-FD$(CROSSBINDIR)
+endif
+ifdef COMPILER_TARGETDIR
+override FPCOPT+=-FE$(COMPILER_TARGETDIR)
+ifeq ($(COMPILER_TARGETDIR),.)
+override TARGETDIRPREFIX=
+else
+override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
+endif
+endif
+ifdef COMPILER_UNITTARGETDIR
+override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
+ifeq ($(COMPILER_UNITTARGETDIR),.)
+override UNITTARGETDIRPREFIX=
+else
+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
+endif
+else
+ifdef COMPILER_TARGETDIR
+override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
+override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
+endif
+endif
+ifdef CREATESHARED
+override FPCOPT+=-Cg
+ifeq ($(CPU_TARGET),i386)
+override FPCOPT+=-Aas
+endif
+endif
+ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
+ifneq ($(findstring $(OS_TARGET),linux solaris),)
+ifeq ($(CPU_TARGET),x86_64)
+override FPCOPT+=-Cg
+endif
+endif
+endif
+ifdef LINKSHARED
+endif
+ifdef GCCLIBDIR
+override FPCOPT+=-Fl$(GCCLIBDIR)
+endif
+ifdef OTHERLIBDIR
+override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
+endif
+ifdef OPT
+override FPCOPT+=$(OPT)
+endif
+ifdef FPCOPTDEF
+override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
+endif
+ifdef CFGFILE
+override FPCOPT+=@$(CFGFILE)
+endif
+ifdef USEENV
+override FPCEXTCMD:=$(FPCOPT)
+override FPCOPT:=!FPCEXTCMD
+export FPCEXTCMD
+endif
+override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
+override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
+ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
+override ACROSSCOMPILE=1
+endif
+ifdef ACROSSCOMPILE
+override FPCOPT+=$(CROSSOPT)
+endif
+override COMPILER:=$(FPC) $(FPCOPT)
+ifeq (,$(findstring -s ,$(COMPILER)))
+EXECPPAS=
+else
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
+EXECPPAS:=@$(PPAS)
+endif
+endif
+endif
+.PHONY: fpc_units
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
+override ALLTARGET+=fpc_units
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
+override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
+override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
+endif
+fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
+ @$(ECHOREDIR) Compiled > $(FPCMADE)
+fpc_all: $(FPCMADE)
+fpc_smart:
+ $(MAKE) all LINKSMART=1 CREATESMART=1
+fpc_debug:
+ $(MAKE) all DEBUG=1
+fpc_release:
+ $(MAKE) all RELEASE=1
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
+$(COMPILER_UNITTARGETDIR):
+ $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
+$(COMPILER_TARGETDIR):
+ $(MKDIRTREE) $(COMPILER_TARGETDIR)
+%$(PPUEXT): %.pp
+ $(COMPILER) $<
+ $(EXECPPAS)
+%$(PPUEXT): %.pas
+ $(COMPILER) $<
+ $(EXECPPAS)
+%$(EXEEXT): %.pp
+ $(COMPILER) $<
+ $(EXECPPAS)
+%$(EXEEXT): %.pas
+ $(COMPILER) $<
+ $(EXECPPAS)
+%$(EXEEXT): %.lpr
+ $(COMPILER) $<
+ $(EXECPPAS)
+%$(EXEEXT): %.dpr
+ $(COMPILER) $<
+ $(EXECPPAS)
+%.res: %.rc
+ windres -i $< -o $@
+vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.inc $(COMPILER_INCLUDEDIR)
+vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
+vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
+.PHONY: fpc_shared
+override INSTALLTARGET+=fpc_shared_install
+ifndef SHARED_LIBVERSION
+SHARED_LIBVERSION=$(FPC_VERSION)
+endif
+ifndef SHARED_LIBNAME
+SHARED_LIBNAME=$(PACKAGE_NAME)
+endif
+ifndef SHARED_FULLNAME
+SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
+endif
+ifndef SHARED_LIBUNITS
+SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
+override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
+endif
+fpc_shared:
+ifdef HASSHAREDLIB
+ $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
+ifneq ($(SHARED_BUILD),n)
+ $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
+endif
+else
+ @$(ECHO) Shared Libraries not supported
+endif
+fpc_shared_install:
+ifneq ($(SHARED_BUILD),n)
+ifneq ($(SHARED_LIBUNITS),)
+ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
+ $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
+endif
+endif
+endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+ifneq ($(UNITTARGETDIRPREFIX),)
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+endif
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+ifneq ($(TARGETDIRPREFIX),)
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
+endif
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+ $(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+ -$(UPXPROG) $(INSTALLEXEFILES)
+endif
+ $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+ $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+ $(MKDIR) $(INSTALL_UNITDIR)
+ $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+ $(MKDIR) $(INSTALL_UNITDIR)
+ $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+ $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+ $(MKDIR) $(INSTALL_LIBDIR)
+ $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+ ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+ $(MKDIR) $(INSTALL_DATADIR)
+ $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+ $(MKDIR) $(INSTALL_SOURCEDIR)
+ $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+ $(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+ $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+ $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
+.PHONY: fpc_clean fpc_cleanall fpc_distclean
+ifdef EXEFILES
+override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
+endif
+ifdef CLEAN_PROGRAMS
+override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
+endif
+ifdef CLEAN_UNITS
+override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
+endif
+ifdef CLEANPPUFILES
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+ifdef DEBUGSYMEXT
+override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
+endif
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
+endif
+fpc_clean: $(CLEANTARGET)
+ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+endif
+ifdef CLEANPPUFILES
+ -$(DEL) $(CLEANPPUFILES)
+endif
+ifneq ($(CLEANPPULINKFILES),)
+ -$(DEL) $(CLEANPPULINKFILES)
+endif
+ifdef CLEANRSTFILES
+ -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
+endif
+ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+endif
+ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+fpc_cleanall: $(CLEANTARGET)
+ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+endif
+ifdef COMPILER_UNITTARGETDIR
+ifdef CLEANPPUFILES
+ -$(DEL) $(CLEANPPUFILES)
+endif
+ifneq ($(CLEANPPULINKFILES),)
+ -$(DEL) $(CLEANPPULINKFILES)
+endif
+ifdef CLEANRSTFILES
+ -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
+endif
+endif
+ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+endif
+ -$(DELTREE) units
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+ -$(DEL) *_ppas$(BATCHEXT)
+ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+endif
+ifdef DEBUGSYMEXT
+ -$(DEL) *$(DEBUGSYMEXT)
+endif
+fpc_distclean: cleanall
+.PHONY: fpc_baseinfo
+override INFORULES+=fpc_baseinfo
+fpc_baseinfo:
+ @$(ECHO)
+ @$(ECHO) == Package info ==
+ @$(ECHO) Package Name..... $(PACKAGE_NAME)
+ @$(ECHO) Package Version.. $(PACKAGE_VERSION)
+ @$(ECHO)
+ @$(ECHO) == Configuration info ==
+ @$(ECHO)
+ @$(ECHO) FPC.......... $(FPC)
+ @$(ECHO) FPC Version.. $(FPC_VERSION)
+ @$(ECHO) Source CPU... $(CPU_SOURCE)
+ @$(ECHO) Target CPU... $(CPU_TARGET)
+ @$(ECHO) Source OS.... $(OS_SOURCE)
+ @$(ECHO) Target OS.... $(OS_TARGET)
+ @$(ECHO) Full Source.. $(FULL_SOURCE)
+ @$(ECHO) Full Target.. $(FULL_TARGET)
+ @$(ECHO) SourceSuffix. $(SOURCESUFFIX)
+ @$(ECHO) TargetSuffix. $(TARGETSUFFIX)
+ @$(ECHO) FPC fpmake... $(FPCFPMAKE)
+ @$(ECHO)
+ @$(ECHO) == Directory info ==
+ @$(ECHO)
+ @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)
+ @$(ECHO)
+ @$(ECHO) Basedir......... $(BASEDIR)
+ @$(ECHO) FPCDir.......... $(FPCDIR)
+ @$(ECHO) CrossBinDir..... $(CROSSBINDIR)
+ @$(ECHO) UnitsDir........ $(UNITSDIR)
+ @$(ECHO) PackagesDir..... $(PACKAGESDIR)
+ @$(ECHO)
+ @$(ECHO) GCC library..... $(GCCLIBDIR)
+ @$(ECHO) Other library... $(OTHERLIBDIR)
+ @$(ECHO)
+ @$(ECHO) == Tools info ==
+ @$(ECHO)
+ @$(ECHO) As........ $(AS)
+ @$(ECHO) Ld........ $(LD)
+ @$(ECHO) Ar........ $(AR)
+ @$(ECHO) Rc........ $(RC)
+ @$(ECHO)
+ @$(ECHO) Mv........ $(MVPROG)
+ @$(ECHO) Cp........ $(CPPROG)
+ @$(ECHO) Rm........ $(RMPROG)
+ @$(ECHO) GInstall.. $(GINSTALL)
+ @$(ECHO) Echo...... $(ECHO)
+ @$(ECHO) Shell..... $(SHELL)
+ @$(ECHO) Date...... $(DATE)
+ @$(ECHO) FPCMake... $(FPCMAKE)
+ @$(ECHO) PPUMove... $(PPUMOVE)
+ @$(ECHO) Upx....... $(UPXPROG)
+ @$(ECHO) Zip....... $(ZIPPROG)
+ @$(ECHO)
+ @$(ECHO) == Object info ==
+ @$(ECHO)
+ @$(ECHO) Target Loaders........ $(TARGET_LOADERS)
+ @$(ECHO) Target Units.......... $(TARGET_UNITS)
+ @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)
+ @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)
+ @$(ECHO) Target Dirs........... $(TARGET_DIRS)
+ @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)
+ @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)
+ @$(ECHO)
+ @$(ECHO) Clean Units......... $(CLEAN_UNITS)
+ @$(ECHO) Clean Files......... $(CLEAN_FILES)
+ @$(ECHO)
+ @$(ECHO) Install Units....... $(INSTALL_UNITS)
+ @$(ECHO) Install Files....... $(INSTALL_FILES)
+ @$(ECHO)
+ @$(ECHO) == Install info ==
+ @$(ECHO)
+ @$(ECHO) DateStr.............. $(DATESTR)
+ @$(ECHO) ZipName.............. $(ZIPNAME)
+ @$(ECHO) ZipPrefix............ $(ZIPPREFIX)
+ @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)
+ @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)
+ @$(ECHO) FullZipName.......... $(FULLZIPNAME)
+ @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)
+ @$(ECHO)
+ @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)
+ @$(ECHO) Install binary dir... $(INSTALL_BINDIR)
+ @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)
+ @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)
+ @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)
+ @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)
+ @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)
+ @$(ECHO) Install data dir..... $(INSTALL_DATADIR)
+ @$(ECHO)
+ @$(ECHO) Dist destination dir. $(DIST_DESTDIR)
+ @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)
+ @$(ECHO)
+.PHONY: fpc_info
+fpc_info: $(INFORULES)
+.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \
+ fpc_makefile_dirs
+fpc_makefile:
+ $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc
+fpc_makefile_sub1:
+ifdef TARGET_DIRS
+ $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS))
+endif
+ifdef TARGET_EXAMPLEDIRS
+ $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS))
+endif
+fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
+fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
+fpc_makefiles: fpc_makefile fpc_makefile_dirs
+all: fpc_all
+debug: fpc_debug
+smart: fpc_smart
+release: fpc_release
+units: fpc_units
+examples:
+shared: fpc_shared
+install: fpc_install
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall
+distinstall:
+zipinstall:
+zipsourceinstall:
+zipexampleinstall:
+zipdistinstall:
+clean: fpc_clean
+distclean: fpc_distclean
+cleanall: fpc_cleanall
+info: fpc_info
+makefiles: fpc_makefiles
+.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
+ifneq ($(wildcard fpcmake.loc),)
+include fpcmake.loc
+endif
+.NOTPARALLEL:
diff --git a/avr32new/packages/fcl-db/src/sqldb/postgres/Makefile b/avr32new/packages/fcl-db/src/sqldb/postgres/Makefile index a81915596e..1061afb8cd 100644 --- a/avr32new/packages/fcl-db/src/sqldb/postgres/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/postgres/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=pqconnection endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=pqconnection +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=pqconnection endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=pqconnection endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=pqconnection +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pqconnection endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=pqconnection endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=pqconnection +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=pqconnection endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=pqconnection endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=pqconnection +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1862,6 +1908,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_POSTGRES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_POSTGRES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2025,6 +2077,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_POSTGRES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_POSTGRES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2033,6 +2091,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2050,6 +2117,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2059,6 +2129,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2076,6 +2155,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2085,6 +2167,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2102,6 +2193,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2111,6 +2205,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2128,6 +2231,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2137,6 +2243,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -2154,6 +2269,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2163,6 +2281,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2180,6 +2307,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2292,7 +2422,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2589,6 +2719,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqldb/sqlite/Makefile b/avr32new/packages/fcl-db/src/sqldb/sqlite/Makefile index 5e02d1d12f..1db6c237f6 100644 --- a/avr32new/packages/fcl-db/src/sqldb/sqlite/Makefile +++ b/avr32new/packages/fcl-db/src/sqldb/sqlite/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=sqlite3conn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=sqlite3conn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=sqlite3conn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=sqlite3conn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=sqlite3conn +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1016,6 +1051,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1676,6 +1716,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_SQLITE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1839,6 +1885,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_SQLITE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1847,6 +1899,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1864,6 +1925,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1873,6 +1937,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1890,6 +1963,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1899,6 +1975,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -1916,6 +2001,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1925,6 +2013,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -1942,6 +2039,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1951,6 +2051,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -1968,6 +2077,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1977,6 +2089,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1994,6 +2115,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2106,7 +2230,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2403,6 +2527,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-db/src/sqlite/Makefile b/avr32new/packages/fcl-db/src/sqlite/Makefile index 64bd9ec77a..f6e390e1cf 100644 --- a/avr32new/packages/fcl-db/src/sqlite/Makefile +++ b/avr32new/packages/fcl-db/src/sqlite/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-db PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -799,6 +828,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1412,6 +1446,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SQLITE=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 @@ -1540,6 +1579,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SQLITE=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1548,6 +1592,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1565,6 +1618,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1574,6 +1630,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -1591,6 +1656,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1600,6 +1668,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1617,6 +1694,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1626,6 +1706,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1643,6 +1732,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1755,7 +1847,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2046,6 +2138,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-extra/Makefile b/avr32new/packages/fcl-extra/Makefile index 62c225b93e..6b65acc3b5 100644 --- a/avr32new/packages/fcl-extra/Makefile +++ b/avr32new/packages/fcl-extra/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-extra override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -464,6 +487,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=daemonapp servicemanager endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=daemonapp servicemanager +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=daemonapp servicemanager endif @@ -539,6 +565,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=daemonapp servicemanager endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=daemonapp servicemanager +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -651,6 +680,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -726,6 +758,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy src/unix endif @@ -837,6 +872,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy src/unix endif @@ -912,6 +950,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/dummy +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1023,6 +1064,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1098,6 +1142,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1444,6 +1491,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2024,6 +2076,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2131,6 +2187,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2139,6 +2199,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2156,6 +2225,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2165,6 +2237,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2182,6 +2263,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2191,6 +2275,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2208,6 +2301,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-REGISTRY PACKAGEDIR_FCL-REGISTRY:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-registry/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2217,6 +2313,15 @@ UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(TARGETSUFFIX) else UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-REGISTRY)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-REGISTRY) $(FPCMADE) @@ -2234,6 +2339,9 @@ endif ifdef UNITDIR_FCL-REGISTRY override COMPILER_UNITDIR+=$(UNITDIR_FCL-REGISTRY) endif +ifdef UNITDIR_FPMAKE_FCL-REGISTRY +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-REGISTRY) +endif endif ifdef REQUIRE_PACKAGES_WINUNITS-BASE PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2243,6 +2351,15 @@ UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX) else UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE) @@ -2260,6 +2377,9 @@ endif ifdef UNITDIR_WINUNITS-BASE override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE) endif +ifdef UNITDIR_FPMAKE_WINUNITS-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_WINUNITS-BASE) +endif endif ifdef REQUIRE_PACKAGES_WINUNITS-JEDI PACKAGEDIR_WINUNITS-JEDI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2269,6 +2389,15 @@ UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX) else UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI) endif +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-JEDI)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-JEDI)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_WINUNITS-JEDI) $(FPCMADE) @@ -2286,6 +2415,9 @@ endif ifdef UNITDIR_WINUNITS-JEDI override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI) endif +ifdef UNITDIR_FPMAKE_WINUNITS-JEDI +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_WINUNITS-JEDI) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2295,6 +2427,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2312,6 +2453,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2424,7 +2568,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2801,6 +2945,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-fpcunit/Makefile b/avr32new/packages/fcl-fpcunit/Makefile index db70025f55..ebba53ace5 100644 --- a/avr32new/packages/fcl-fpcunit/Makefile +++ b/avr32new/packages/fcl-fpcunit/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-fpcunit override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=testregistry testreport testdecorator ubmockobject xmlreporter fpcunitreport latextestreport xmltestreport plaintestreport fpcunit testutils digesttestreport +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1899,6 +1945,13 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -2087,6 +2140,13 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2095,6 +2155,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2112,6 +2181,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2121,6 +2193,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2138,6 +2219,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2147,6 +2231,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2164,6 +2257,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2173,6 +2269,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2190,6 +2295,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2199,6 +2307,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2216,6 +2333,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2225,6 +2345,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2242,6 +2371,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2251,6 +2383,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2268,6 +2409,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2380,7 +2524,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2763,6 +2907,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-image/Makefile b/avr32new/packages/fcl-image/Makefile index 66a18b59ab..0b99c6f985 100644 --- a/avr32new/packages/fcl-image/Makefile +++ b/avr32new/packages/fcl-image/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-image override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -455,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx fptiffcmn fpreadtiff fpwritetiff targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation fpreadgif fpreadpsd xwdfile fpreadxwd freetypeh freetype ftfont endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpimgcmn fpimage pngcomn fpreadpng fpwritepng fpreadxpm fpwritexpm clipping fpcanvas pixtools fppixlcanv fpimgcanv pscanvas fpwritebmp fpreadbmp bmpcomn fpreadpnm fpwritepnm fpreadjpeg fpwritejpeg pcxcomn fpreadpcx fpwritepcx fptiffcmn fpreadtiff fpwritetiff targacmn fpreadtga fpwritetga ellipses fpcolhash fpditherer fpquantizer extinterpolation fpreadgif fpreadpsd xwdfile fpreadxwd +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pscanvas endif @@ -644,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=pscanvas endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=pscanvas +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -833,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -1023,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1212,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2435,6 +2473,13 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2443,6 +2488,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2460,6 +2514,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2469,6 +2526,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -2486,6 +2552,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2495,6 +2564,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2512,6 +2590,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2521,6 +2602,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2538,6 +2628,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2547,6 +2640,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2564,6 +2666,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2573,6 +2678,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2590,6 +2704,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2702,7 +2819,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3097,6 +3214,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3373,6 +3491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/fcl-image/examples/Makefile b/avr32new/packages/fcl-image/examples/Makefile index d7d2c43258..d65668f785 100644 --- a/avr32new/packages/fcl-image/examples/Makefile +++ b/avr32new/packages/fcl-image/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=imgconv drawing xwdtobmp endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=imgconv drawing xwdtobmp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=imgconv drawing xwdtobmp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=imgconv drawing xwdtobmp endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=imgconv drawing xwdtobmp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=imgconv drawing xwdtobmp +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1521,6 +1555,14 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1724,6 +1766,14 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1732,6 +1782,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1749,6 +1808,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1758,6 +1820,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1775,6 +1846,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1784,6 +1858,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1801,6 +1884,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1810,6 +1896,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -1827,6 +1922,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1836,6 +1934,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1853,6 +1960,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1862,6 +1972,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -1879,6 +1998,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1888,6 +2010,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1905,6 +2036,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2017,7 +2151,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2316,6 +2450,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-js/Makefile b/avr32new/packages/fcl-js/Makefile index 764b22d173..faca43c8e4 100644 --- a/avr32new/packages/fcl-js/Makefile +++ b/avr32new/packages/fcl-js/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-js override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=jsbase jstree jsscanner jsparser endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=jsbase jstree jsscanner jsparser +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=jsbase jstree jsscanner jsparser endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=jsbase jstree jsscanner jsparser endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=jsbase jstree jsscanner jsparser +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-json/Makefile b/avr32new/packages/fcl-json/Makefile index 4ad9d8c0fc..95516d9b49 100644 --- a/avr32new/packages/fcl-json/Makefile +++ b/avr32new/packages/fcl-json/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-json override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpjson jsonscanner jsonparser jsonconf fpjsonrtti +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1933,6 +1985,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2036,6 +2092,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2044,6 +2104,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2061,6 +2130,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2070,6 +2142,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2087,6 +2168,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2096,6 +2180,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2113,6 +2206,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2225,7 +2321,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2602,6 +2698,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-net/Makefile b/avr32new/packages/fcl-net/Makefile index 3fea20b1a5..ee76cfc05f 100644 --- a/avr32new/packages/fcl-net/Makefile +++ b/avr32new/packages/fcl-net/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-net override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -486,6 +509,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -561,6 +587,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif @@ -672,6 +701,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif @@ -747,6 +779,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -858,6 +893,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -933,6 +971,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1310,6 +1351,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2007,6 +2053,13 @@ REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_FCL-ASYNC=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2195,6 +2248,13 @@ REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_FCL-ASYNC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_FCL-ASYNC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2203,6 +2263,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2220,6 +2289,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2229,6 +2301,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2246,6 +2327,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2255,6 +2339,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2272,6 +2365,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2281,6 +2377,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2298,6 +2403,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-PASSRC PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2307,6 +2415,15 @@ UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PASSRC) $(FPCMADE) @@ -2324,6 +2441,9 @@ endif ifdef UNITDIR_FCL-PASSRC override COMPILER_UNITDIR+=$(UNITDIR_FCL-PASSRC) endif +ifdef UNITDIR_FPMAKE_FCL-PASSRC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PASSRC) +endif endif ifdef REQUIRE_PACKAGES_FCL-ASYNC PACKAGEDIR_FCL-ASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-async/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2333,6 +2453,15 @@ UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-ASYNC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-ASYNC) $(FPCMADE) @@ -2350,6 +2479,9 @@ endif ifdef UNITDIR_FCL-ASYNC override COMPILER_UNITDIR+=$(UNITDIR_FCL-ASYNC) endif +ifdef UNITDIR_FPMAKE_FCL-ASYNC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-ASYNC) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2359,6 +2491,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2376,6 +2517,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2488,7 +2632,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2871,6 +3015,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-passrc/Makefile b/avr32new/packages/fcl-passrc/Makefile index 4be5fd237a..e47e7eb970 100644 --- a/avr32new/packages/fcl-passrc/Makefile +++ b/avr32new/packages/fcl-passrc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-passrc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=pastree pscanner pparser paswrite endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=pastree pscanner pparser paswrite +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=pastree pscanner pparser paswrite endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=pastree pscanner pparser paswrite endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=pastree pscanner pparser paswrite +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=pscanner pparser pastree endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=pscanner pparser pastree endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=pscanner pparser pastree +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=pscanner pparser pastree endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=pscanner pparser pastree endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=pscanner pparser pastree +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2482,6 +2552,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-process/Makefile b/avr32new/packages/fcl-process/Makefile index c2b4b15053..830e522647 100644 --- a/avr32new/packages/fcl-process/Makefile +++ b/avr32new/packages/fcl-process/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -107,37 +107,25 @@ FPC=$(PP) endif endif ifndef FPC -DETERMINE_NATIVE_COMPILER=1 -else -ifdef CROSSCOMPILE -ifndef FPCFPMAKE -DETERMINE_NATIVE_COMPILER=1 -endif -endif -endif -ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPCNATIVE:=$(shell $(FPCPROG) -PB) +FPC:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPCNATIVE)),) -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPC)),) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPCNATIVE))),) -FPCNATIVE:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPC))),) +FPC:=$(firstword $(FPCPROG)) endif endif else -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif endif -ifndef FPC -FPC=$(FPCNATIVE) -endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) FOUNDFPC:=$(strip $(wildcard $(FPC))) @@ -279,7 +267,16 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F ifndef FPCFPMAKE ifdef CROSSCOMPILE ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) -FPCFPMAKE:=$(FPCNATIVE) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif else FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) FPMAKE_SKIP_CONFIG=-n @@ -288,9 +285,6 @@ export FPMAKE_SKIP_CONFIG endif else FPCFPMAKE=$(FPC) -FPMAKE_SKIP_CONFIG=-n -export FPCFPMAKE -export FPMAKE_SKIP_CONFIG endif endif override PACKAGE_NAME=fcl-process @@ -484,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=pipes process simpleipc dbugmsg dbugintf pipesipc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=pipes process +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=process simpleipc endif @@ -673,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=process simpleipc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=process simpleipc +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -863,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy endif @@ -1052,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif @@ -1241,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2206,6 +2215,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2355,7 +2367,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fcl-registry/Makefile b/avr32new/packages/fcl-registry/Makefile index a6cbaed964..f6b46535fe 100644 --- a/avr32new/packages/fcl-registry/Makefile +++ b/avr32new/packages/fcl-registry/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-registry override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=xmlreg registry endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=xmlreg registry +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=xmlreg registry endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=xmlreg registry endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=xmlreg registry +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1825,6 +1871,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -1963,6 +2014,11 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1971,6 +2027,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1988,6 +2053,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1997,6 +2065,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2014,6 +2091,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2023,6 +2103,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2040,6 +2129,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2049,6 +2141,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2066,6 +2167,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2075,6 +2179,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2092,6 +2205,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2204,7 +2320,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2587,6 +2703,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-res/Makefile b/avr32new/packages/fcl-res/Makefile index 4206d0fe23..9fd727f88b 100644 --- a/avr32new/packages/fcl-res/Makefile +++ b/avr32new/packages/fcl-res/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-res override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=acceleratorsresource bitmapresource coffconsts coffreader cofftypes coffwriter dfmreader elfconsts elfreader elftypes elfwriter externalreader externaltypes externalwriter fpcrestypes groupcursorresource groupiconresource groupresource icocurtypes machoconsts machoreader machotypes machowriter resdatastream resfactory resmerger resource resourcetree resreader reswriter stringtableresource strtable tlbreader versionconsts versionresource versiontypes winpeimagereader endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=acceleratorsresource bitmapresource coffconsts coffreader cofftypes coffwriter dfmreader elfconsts elfreader elftypes elfwriter externalreader externaltypes externalwriter fpcrestypes groupcursorresource groupiconresource groupresource icocurtypes machoconsts machoreader machotypes machowriter resdatastream resfactory resmerger resource resourcetree resreader reswriter stringtableresource strtable tlbreader versionconsts versionresource versiontypes winpeimagereader +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=acceleratorsresource bitmapresource coffconsts coffreader cofftypes coffwriter dfmreader elfconsts elfreader elftypes elfwriter externalreader externaltypes externalwriter fpcrestypes groupcursorresource groupiconresource groupresource icocurtypes machoconsts machoreader machotypes machowriter resdatastream resfactory resmerger resource resourcetree resreader reswriter stringtableresource strtable tlbreader versionconsts versionresource versiontypes winpeimagereader endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=acceleratorsresource bitmapresource coffconsts coffreader cofftypes coffwriter dfmreader elfconsts elfreader elftypes elfwriter externalreader externaltypes externalwriter fpcrestypes groupcursorresource groupiconresource groupresource icocurtypes machoconsts machoreader machotypes machowriter resdatastream resfactory resmerger resource resourcetree resreader reswriter stringtableresource strtable tlbreader versionconsts versionresource versiontypes winpeimagereader endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=acceleratorsresource bitmapresource coffconsts coffreader cofftypes coffwriter dfmreader elfconsts elfreader elftypes elfwriter externalreader externaltypes externalwriter fpcrestypes groupcursorresource groupiconresource groupresource icocurtypes machoconsts machoreader machotypes machowriter resdatastream resfactory resmerger resource resourcetree resreader reswriter stringtableresource strtable tlbreader versionconsts versionresource versiontypes winpeimagereader +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=versiontypes stringtableresource resource resfactory endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=versiontypes stringtableresource resource resfactory endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=versiontypes stringtableresource resource resfactory +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=versiontypes stringtableresource resource resfactory endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=versiontypes stringtableresource resource resfactory endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=versiontypes stringtableresource resource resfactory +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2482,6 +2552,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fcl-web/Makefile b/avr32new/packages/fcl-web/Makefile index 09ec5153c6..933e030349 100644 --- a/avr32new/packages/fcl-web/Makefile +++ b/avr32new/packages/fcl-web/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -1518,6 +1518,13 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1819,7 +1826,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fcl-xml/Makefile b/avr32new/packages/fcl-xml/Makefile index 67ea7f483e..f5c3859758 100644 --- a/avr32new/packages/fcl-xml/Makefile +++ b/avr32new/packages/fcl-xml/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/23] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fcl-xml override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=sax xpath htmlwriter xmlconf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=sax xpath htmlwriter xmlconf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=sax xpath htmlwriter xmlconf +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1974,6 +2026,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2087,6 +2143,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_ICONVENC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2095,6 +2155,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2112,6 +2181,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2121,6 +2193,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2138,6 +2219,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2147,6 +2231,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2164,6 +2257,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2173,6 +2269,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2190,6 +2295,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2302,7 +2410,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2685,6 +2793,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fftw/Makefile b/avr32new/packages/fftw/Makefile index eef5eaf3b6..83bfbf543f 100644 --- a/avr32new/packages/fftw/Makefile +++ b/avr32new/packages/fftw/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fftw override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fftw_s endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fftw_s +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fftw_s endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fftw_s endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fftw_s +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fpgtk/Makefile b/avr32new/packages/fpgtk/Makefile index 8bea3b92dc..23dbb6679a 100644 --- a/avr32new/packages/fpgtk/Makefile +++ b/avr32new/packages/fpgtk/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fpgtk override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=fpglib fpgtk fpgtkext +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpglib fpgtk fpgtkext endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpglib fpgtk fpgtkext +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=fpgtk fpgtkext endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=fpgtk fpgtkext +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=fpgtk fpgtkext endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpgtk fpgtkext endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpgtk fpgtkext +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src src/editor src/def src/pgtk tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2050,6 +2102,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2214,6 +2272,12 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2222,6 +2286,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2239,6 +2312,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2248,6 +2324,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2265,6 +2350,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2274,6 +2362,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2291,6 +2388,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2300,6 +2400,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2317,6 +2426,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2326,6 +2438,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -2343,6 +2464,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2352,6 +2476,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2369,6 +2502,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2481,7 +2617,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2864,6 +3000,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/fpmkunit/Makefile b/avr32new/packages/fpmkunit/Makefile index 5757194bde..55fdbc4201 100644 --- a/avr32new/packages/fpmkunit/Makefile +++ b/avr32new/packages/fpmkunit/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -284,7 +284,6 @@ export FPCFPMAKE export FPMAKE_SKIP_CONFIG endif else -FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif @@ -481,6 +480,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpmkunit endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpmkunit +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -671,6 +673,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -860,6 +865,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2014,6 +2022,12 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2277,7 +2291,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fppkg/Makefile b/avr32new/packages/fppkg/Makefile index 113da2c188..22bc69699e 100644 --- a/avr32new/packages/fppkg/Makefile +++ b/avr32new/packages/fppkg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/22] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -107,36 +107,24 @@ FPC=$(PP) endif endif ifndef FPC -DETERMINE_NATIVE_COMPILER=1 -else -ifdef CROSSCOMPILE -ifndef FPCFPMAKE -DETERMINE_NATIVE_COMPILER=1 -endif -endif -endif -ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPCNATIVE:=$(shell $(FPCPROG) -PB) +FPC:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPCNATIVE)),) -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPC)),) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPCNATIVE))),) -FPCNATIVE:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPC))),) +FPC:=$(firstword $(FPCPROG)) endif endif else -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) -endif +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif -ifndef FPC -FPC=$(FPCNATIVE) endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) @@ -279,14 +267,24 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F ifndef FPCFPMAKE ifdef CROSSCOMPILE ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) -FPCFPMAKE:=$(FPCNATIVE) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif else FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n export FPCFPMAKE +export FPMAKE_SKIP_CONFIG endif else FPCFPMAKE=$(FPC) -export FPCFPMAKE endif endif override PACKAGE_NAME=fppkg @@ -480,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos pkgwget pkgfphttp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fprepos fpxmlrep pkgoptions pkgglobals pkgmessages pkghandler pkgmkconv pkgdownload pkgfpmake pkgcommands pkgrepos +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif @@ -669,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fprepos fpxmlrep pkgmessages endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fprepos fpxmlrep pkgmessages +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -859,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1048,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2700,6 +2710,19 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_FCL-WEB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_FCL-ASYNC=1 +REQUIRE_PACKAGES_FCL-NET=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3305,7 +3328,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fpvectorial/Makefile b/avr32new/packages/fpvectorial/Makefile index c28a8abdf9..e40bf3642b 100644 --- a/avr32new/packages/fpvectorial/Makefile +++ b/avr32new/packages/fpvectorial/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/12] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -478,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=fpvectbuildunit endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=fpvectbuildunit +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=avisocncgcodereader avisocncgcodewriter avisozlib fpvectorial fpvtocanvas pdfvectorialreader pdfvrlexico pdfvrsemantico pdfvrsintatico cdrvectorialreader svgvectorialwriter epsvectorialreader fpvutils endif @@ -667,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=avisocncgcodereader avisocncgcodewriter avisozlib fpvectorial fpvtocanvas pdfvectorialreader pdfvrlexico pdfvrsemantico pdfvrsintatico cdrvectorialreader svgvectorialwriter epsvectorialreader fpvutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=avisocncgcodereader avisocncgcodewriter avisozlib fpvectorial fpvtocanvas pdfvectorialreader pdfvrlexico pdfvrsemantico pdfvrsintatico cdrvectorialreader svgvectorialwriter epsvectorialreader fpvutils +endif override INSTALL_BUILDUNIT=fpvectbuildunit override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -858,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1047,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -2366,6 +2378,14 @@ REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2743,7 +2763,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/fv/Makefile b/avr32new/packages/fv/Makefile index e1c05ad582..a65182ef92 100644 --- a/avr32new/packages/fv/Makefile +++ b/avr32new/packages/fv/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fv override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=buildfv endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=buildfv +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=buildfv endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildfv endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildfv +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=app colortxt dialogs drivers editors fvcommon fvconsts gadgets histlist inplong memory menus msgbox statuses stddlg tabs time validate views sysmsg asciitab timeddlg outline +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=app dialogs editors msgbox stddlg +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=app dialogs editors msgbox stddlg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=app dialogs editors msgbox stddlg +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -935,6 +976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -1010,6 +1054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_BUILDUNIT=buildfv override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -1123,6 +1170,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1198,6 +1248,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1544,6 +1597,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2080,6 +2138,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2155,6 +2216,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2163,6 +2227,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2180,6 +2253,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2292,7 +2368,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2687,6 +2763,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2885,6 +2962,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2960,6 +3040,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/fv/examples/Makefile b/avr32new/packages/fv/examples/Makefile index e14d348af8..adb9386b1f 100644 --- a/avr32new/packages/fv/examples/Makefile +++ b/avr32new/packages/fv/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testapp endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testapp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testapp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testapp endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testapp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testapp +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -796,6 +825,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1369,6 +1403,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 @@ -1469,6 +1507,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FV=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FV=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1477,6 +1519,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1494,6 +1545,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FV PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1503,6 +1557,15 @@ UNITDIR_FV=$(PACKAGEDIR_FV)/units/$(TARGETSUFFIX) else UNITDIR_FV=$(PACKAGEDIR_FV) endif +ifneq ($(wildcard $(PACKAGEDIR_FV)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FV=$(PACKAGEDIR_FV) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FV)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE) @@ -1520,6 +1583,9 @@ endif ifdef UNITDIR_FV override COMPILER_UNITDIR+=$(UNITDIR_FV) endif +ifdef UNITDIR_FPMAKE_FV +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FV) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1632,7 +1698,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1931,6 +1997,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gdbint/Makefile b/avr32new/packages/gdbint/Makefile index 7b162f168d..9fa1ce6427 100644 --- a/avr32new/packages/gdbint/Makefile +++ b/avr32new/packages/gdbint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gdbint override PACKAGE_VERSION=2.5.1 ifdef inUnix @@ -409,6 +432,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gdbint gdbcon endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gdbint gdbcon +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gdbint gdbcon endif @@ -484,6 +510,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gdbint gdbcon endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gdbint gdbcon +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=examples/testgdb examples/symify endif @@ -595,6 +624,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=examples/testgdb examples/symify endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=examples/testgdb examples/symify +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=examples/testgdb examples/symify endif @@ -670,6 +702,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=examples/testgdb examples/symify endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=examples/testgdb examples/symify +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src @@ -782,6 +817,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif @@ -857,6 +895,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -968,6 +1009,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1043,6 +1087,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -1154,6 +1201,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OBJECTDIR+=$(GDBLIBDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif @@ -1229,6 +1279,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OBJECTDIR+=$(GDBLIBDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OBJECTDIR+=$(GDBLIBDIR) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1340,6 +1393,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif @@ -1415,6 +1471,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_LIBRARYDIR+=$(GDBLIBDIR) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1792,6 +1851,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2328,6 +2392,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2403,6 +2470,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2411,6 +2481,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2428,6 +2507,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2540,7 +2622,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2941,6 +3023,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gdbm/Makefile b/avr32new/packages/gdbm/Makefile index 4c2366b65d..9cb066a5c2 100644 --- a/avr32new/packages/gdbm/Makefile +++ b/avr32new/packages/gdbm/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gdbm override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gdbm endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gdbm +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gdbm endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gdbm endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gdbm +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1359,6 +1406,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1895,6 +1947,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1970,6 +2025,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1978,6 +2036,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1995,6 +2062,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2107,7 +2177,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2502,6 +2572,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2700,6 +2771,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2775,6 +2849,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/gdbm/examples/Makefile b/avr32new/packages/gdbm/examples/Makefile index 3acf3fd683..c91de4cb04 100644 --- a/avr32new/packages/gdbm/examples/Makefile +++ b/avr32new/packages/gdbm/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testgdbm testgdbm2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testgdbm testgdbm2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testgdbm testgdbm2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testgdbm testgdbm2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testgdbm testgdbm2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testgdbm testgdbm2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GDBM=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GDBM=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GDBM=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GDBM=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GDBM=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_GDBM PACKAGEDIR_GDBM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gdbm/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_GDBM=$(PACKAGEDIR_GDBM)/units/$(TARGETSUFFIX) else UNITDIR_GDBM=$(PACKAGEDIR_GDBM) endif +ifneq ($(wildcard $(PACKAGEDIR_GDBM)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GDBM=$(PACKAGEDIR_GDBM)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GDBM)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GDBM=$(PACKAGEDIR_GDBM)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GDBM=$(PACKAGEDIR_GDBM) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GDBM)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GDBM) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_GDBM override COMPILER_UNITDIR+=$(UNITDIR_GDBM) endif +ifdef UNITDIR_FPMAKE_GDBM +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GDBM) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/ggi/Makefile b/avr32new/packages/ggi/Makefile index 9b0ffaa1f0..4205311e15 100644 --- a/avr32new/packages/ggi/Makefile +++ b/avr32new/packages/ggi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ggi override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gii ggi ggi2d endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gii ggi ggi2d +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gii ggi ggi2d endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gii ggi ggi2d endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gii ggi ggi2d +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/ggi/examples/Makefile b/avr32new/packages/ggi/examples/Makefile index 20655370ca..882d8f53fd 100644 --- a/avr32new/packages/ggi/examples/Makefile +++ b/avr32new/packages/ggi/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=ggi1 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=ggi1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=ggi1 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=ggi1 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=ggi1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=ggi1 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GGI=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GGI=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GGI=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GGI=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GGI=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_GGI PACKAGEDIR_GGI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ggi/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_GGI=$(PACKAGEDIR_GGI)/units/$(TARGETSUFFIX) else UNITDIR_GGI=$(PACKAGEDIR_GGI) endif +ifneq ($(wildcard $(PACKAGEDIR_GGI)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GGI=$(PACKAGEDIR_GGI)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GGI)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GGI=$(PACKAGEDIR_GGI)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GGI=$(PACKAGEDIR_GGI) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GGI)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GGI) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_GGI override COMPILER_UNITDIR+=$(UNITDIR_GGI) endif +ifdef UNITDIR_FPMAKE_GGI +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GGI) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gmp/Makefile b/avr32new/packages/gmp/Makefile index d98ff90bcd..24e0e0db6f 100644 --- a/avr32new/packages/gmp/Makefile +++ b/avr32new/packages/gmp/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gmp override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gmp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gmp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gmp endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gmp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gmp +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -937,6 +978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1012,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1391,6 +1438,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1927,6 +1979,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2002,6 +2057,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2010,6 +2068,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2027,6 +2094,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2139,7 +2209,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2540,6 +2610,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2738,6 +2809,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2813,6 +2887,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/gmp/examples/Makefile b/avr32new/packages/gmp/examples/Makefile index 1f7f367917..8bb255f5a5 100644 --- a/avr32new/packages/gmp/examples/Makefile +++ b/avr32new/packages/gmp/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GMP=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GMP=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GMP=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_GMP=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_GMP=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_GMP PACKAGEDIR_GMP:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gmp/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_GMP=$(PACKAGEDIR_GMP)/units/$(TARGETSUFFIX) else UNITDIR_GMP=$(PACKAGEDIR_GMP) endif +ifneq ($(wildcard $(PACKAGEDIR_GMP)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GMP=$(PACKAGEDIR_GMP)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GMP)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GMP=$(PACKAGEDIR_GMP)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GMP=$(PACKAGEDIR_GMP) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GMP)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GMP) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_GMP override COMPILER_UNITDIR+=$(UNITDIR_GMP) endif +ifdef UNITDIR_FPMAKE_GMP +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GMP) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gnome1/Makefile b/avr32new/packages/gnome1/Makefile index 5a2d2979e2..5622d52e3e 100644 --- a/avr32new/packages/gnome1/Makefile +++ b/avr32new/packages/gnome1/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gnome1 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=libzvt libart libgnome gconf gconfclient libgnomeui +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src src/libgnome src/zvt src/gconf src/gconfclient src/libgnomeui +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples src src/zvt src/libgnome src/gconfclient src/gconf src/libgnomeui +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1886,6 +1932,13 @@ REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_IMLIB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2061,6 +2114,13 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_IMLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_IMLIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2069,6 +2129,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2086,6 +2155,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2095,6 +2167,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2112,6 +2193,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2121,6 +2205,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2138,6 +2231,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2147,6 +2243,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -2164,6 +2269,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifdef REQUIRE_PACKAGES_IMLIB PACKAGEDIR_IMLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /imlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2173,6 +2281,15 @@ UNITDIR_IMLIB=$(PACKAGEDIR_IMLIB)/units/$(TARGETSUFFIX) else UNITDIR_IMLIB=$(PACKAGEDIR_IMLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_IMLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IMLIB=$(PACKAGEDIR_IMLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IMLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IMLIB=$(PACKAGEDIR_IMLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IMLIB=$(PACKAGEDIR_IMLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IMLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IMLIB) $(FPCMADE) @@ -2190,6 +2307,9 @@ endif ifdef UNITDIR_IMLIB override COMPILER_UNITDIR+=$(UNITDIR_IMLIB) endif +ifdef UNITDIR_FPMAKE_IMLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IMLIB) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2302,7 +2422,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2685,6 +2805,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/graph/Makefile b/avr32new/packages/graph/Makefile index c4f4178d87..6d45aae1ec 100644 --- a/avr32new/packages/graph/Makefile +++ b/avr32new/packages/graph/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=graph override PACKAGE_VERSION=2.5.1 GRAPHDIR=src/inc @@ -534,6 +557,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT) +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -724,6 +750,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif @@ -913,6 +942,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples endif @@ -1102,6 +1134,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -2158,6 +2193,9 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_PTC=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2166,6 +2204,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2183,6 +2230,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HERMES PACKAGEDIR_HERMES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hermes/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2192,6 +2242,15 @@ UNITDIR_HERMES=$(PACKAGEDIR_HERMES)/units/$(TARGETSUFFIX) else UNITDIR_HERMES=$(PACKAGEDIR_HERMES) endif +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HERMES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HERMES) $(FPCMADE) @@ -2209,6 +2268,9 @@ endif ifdef UNITDIR_HERMES override COMPILER_UNITDIR+=$(UNITDIR_HERMES) endif +ifdef UNITDIR_FPMAKE_HERMES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HERMES) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2218,6 +2280,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2235,6 +2306,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2244,6 +2318,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2261,6 +2344,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_PTC PACKAGEDIR_PTC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ptc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2270,6 +2356,15 @@ UNITDIR_PTC=$(PACKAGEDIR_PTC)/units/$(TARGETSUFFIX) else UNITDIR_PTC=$(PACKAGEDIR_PTC) endif +ifneq ($(wildcard $(PACKAGEDIR_PTC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PTC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PTC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PTC) $(FPCMADE) @@ -2287,6 +2382,9 @@ endif ifdef UNITDIR_PTC override COMPILER_UNITDIR+=$(UNITDIR_PTC) endif +ifdef UNITDIR_FPMAKE_PTC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PTC) +endif endif ifdef REQUIRE_PACKAGES_PTHREADS PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2296,6 +2394,15 @@ UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(TARGETSUFFIX) else UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS) endif +ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PTHREADS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE) @@ -2313,6 +2420,9 @@ endif ifdef UNITDIR_PTHREADS override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS) endif +ifdef UNITDIR_FPMAKE_PTHREADS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PTHREADS) +endif endif ifdef REQUIRE_PACKAGES_SDL PACKAGEDIR_SDL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sdl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2322,6 +2432,15 @@ UNITDIR_SDL=$(PACKAGEDIR_SDL)/units/$(TARGETSUFFIX) else UNITDIR_SDL=$(PACKAGEDIR_SDL) endif +ifneq ($(wildcard $(PACKAGEDIR_SDL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SDL=$(PACKAGEDIR_SDL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SDL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SDL=$(PACKAGEDIR_SDL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SDL=$(PACKAGEDIR_SDL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SDL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SDL) $(FPCMADE) @@ -2339,6 +2458,9 @@ endif ifdef UNITDIR_SDL override COMPILER_UNITDIR+=$(UNITDIR_SDL) endif +ifdef UNITDIR_FPMAKE_SDL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SDL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2451,7 +2573,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2834,6 +2956,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk1/Makefile b/avr32new/packages/gtk1/Makefile index 2227d1e1ac..1662f3fab6 100644 --- a/avr32new/packages/gtk1/Makefile +++ b/avr32new/packages/gtk1/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gtk1 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1204,6 +1245,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1789,6 +1835,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1900,6 +1950,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1908,6 +1962,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1925,6 +1988,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1934,6 +2000,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1951,6 +2026,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1960,6 +2038,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -1977,6 +2064,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2089,7 +2179,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2490,6 +2580,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2688,6 +2779,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2763,6 +2857,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/gtk1/examples/Makefile b/avr32new/packages/gtk1/examples/Makefile index 9ac1eba032..f51b525ea3 100644 --- a/avr32new/packages/gtk1/examples/Makefile +++ b/avr32new/packages/gtk1/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_DIRS+=tutorial endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=tutorial endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=tutorial +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=tutorial endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=tutorial endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=tutorial +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=tictactoe endif @@ -747,6 +782,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=tictactoe endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=tictactoe +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=tictactoe endif @@ -822,6 +860,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=tictactoe endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=tictactoe +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1200,6 +1241,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1822,6 +1868,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1958,6 +2009,11 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1966,6 +2022,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1983,6 +2048,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1992,6 +2060,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2009,6 +2086,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2018,6 +2098,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2035,6 +2124,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2044,6 +2136,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -2061,6 +2162,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2173,7 +2277,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2478,6 +2582,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2676,6 +2781,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_DIRS_TUTORIAL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_TUTORIAL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_TUTORIAL=1 endif @@ -2751,6 +2859,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_TUTORIAL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_TUTORIAL=1 +endif ifdef TARGET_DIRS_TUTORIAL tutorial_all: $(MAKE) -C tutorial all diff --git a/avr32new/packages/gtk1/examples/tutorial/Makefile b/avr32new/packages/gtk1/examples/tutorial/Makefile index 05f8754301..b2b0e93aa8 100644 --- a/avr32new/packages/gtk1/examples/tutorial/Makefile +++ b/avr32new/packages/gtk1/examples/tutorial/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -642,6 +665,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1227,6 +1255,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 @@ -1338,6 +1370,10 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_X11),) @@ -1346,6 +1382,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1363,6 +1408,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1372,6 +1420,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -1389,6 +1446,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1398,6 +1458,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -1415,6 +1484,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1527,7 +1599,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1671,6 +1743,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/Makefile b/avr32new/packages/gtk2/Makefile index 7beda38d65..a236d625b9 100644 --- a/avr32new/packages/gtk2/Makefile +++ b/avr32new/packages/gtk2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=gtk2 override PACKAGE_VERSION=2.5.1 ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin iphonesim beos haiku ),) @@ -382,6 +405,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=src/buildgtk2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=src/buildgtk2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=src/buildgtk2 endif @@ -457,6 +483,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=src/buildgtk2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=src/buildgtk2 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) endif @@ -568,6 +597,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) endif @@ -643,6 +675,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=glib2 atk pango pangocairo gdk2pixbuf gdk2 gtk2 libglade2 gtkglext gdkglext gtk2ext $(GDK2X) +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -754,6 +789,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -829,6 +867,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_BUILDUNIT=buildgtk2 override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -942,6 +983,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif @@ -1017,6 +1061,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(GTK2X11INCLUDE) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) endif @@ -1128,6 +1175,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) endif @@ -1203,6 +1253,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=src src/glib src/atk src/pango src/pangocairo src/gtk+/gdk-pixbuf src/gtk+/gdk src/gtk+/gtk src/libglade src/gtkglext src/gtkext src/$(GTK2X11) +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1582,6 +1635,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2359,6 +2417,15 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2600,6 +2667,15 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2608,6 +2684,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2625,6 +2710,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2634,6 +2722,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -2651,6 +2748,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2660,6 +2760,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2677,6 +2786,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2686,6 +2798,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2703,6 +2824,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2712,6 +2836,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2729,6 +2862,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2738,6 +2874,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2755,6 +2900,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2764,6 +2912,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2781,6 +2938,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2790,6 +2950,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2807,6 +2976,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2816,6 +2988,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2833,6 +3014,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2945,7 +3129,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3346,6 +3530,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3544,6 +3729,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -3619,6 +3807,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/gtk2/examples/Makefile b/avr32new/packages/gtk2/examples/Makefile index c93211061d..589dff4a37 100644 --- a/avr32new/packages/gtk2/examples/Makefile +++ b/avr32new/packages/gtk2/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_HASH=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_PASJPEG),) @@ -1916,6 +1970,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2423,6 +2597,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2843,6 +3018,15 @@ TARGET_DIRS_PLUGINS=1 TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_HELLOWORLD=1 +TARGET_DIRS_HELLOWORLD2=1 +TARGET_DIRS_GTK_DEMO=1 +TARGET_DIRS_GETTINGSTARTED=1 +TARGET_DIRS_PLUGINS=1 +TARGET_DIRS_SCRIBBLE_SIMPLE=1 +TARGET_DIRS_GTKGLEXT=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_HELLOWORLD=1 TARGET_DIRS_HELLOWORLD2=1 @@ -3068,6 +3252,15 @@ TARGET_DIRS_PLUGINS=1 TARGET_DIRS_SCRIBBLE_SIMPLE=1 TARGET_DIRS_GTKGLEXT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_HELLOWORLD=1 +TARGET_DIRS_HELLOWORLD2=1 +TARGET_DIRS_GTK_DEMO=1 +TARGET_DIRS_GETTINGSTARTED=1 +TARGET_DIRS_PLUGINS=1 +TARGET_DIRS_SCRIBBLE_SIMPLE=1 +TARGET_DIRS_GTKGLEXT=1 +endif ifdef TARGET_DIRS_HELLOWORLD helloworld_all: $(MAKE) -C helloworld all diff --git a/avr32new/packages/gtk2/examples/gettingstarted/Makefile b/avr32new/packages/gtk2/examples/gettingstarted/Makefile index a338e44beb..5a2f354516 100644 --- a/avr32new/packages/gtk2/examples/gettingstarted/Makefile +++ b/avr32new/packages/gtk2/examples/gettingstarted/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=gettingstarted endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=gettingstarted endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=gettingstarted +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=gettingstarted endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gettingstarted endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gettingstarted +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/gtk_demo/Makefile b/avr32new/packages/gtk2/examples/gtk_demo/Makefile index 85d906524f..b2dcdec2db 100644 --- a/avr32new/packages/gtk2/examples/gtk_demo/Makefile +++ b/avr32new/packages/gtk2/examples/gtk_demo/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=gtk_demo endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=gtk_demo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=gtk_demo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=gtk_demo endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gtk_demo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gtk_demo +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/gtkglext/Makefile b/avr32new/packages/gtk2/examples/gtkglext/Makefile index 92e26e6866..4e3db42370 100644 --- a/avr32new/packages/gtk2/examples/gtkglext/Makefile +++ b/avr32new/packages/gtk2/examples/gtkglext/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=gears endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=gears endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=gears +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=gears endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gears endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gears +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1679,6 +1713,17 @@ REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1970,6 +2015,17 @@ REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1978,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1995,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2004,6 +2072,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -2021,6 +2098,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2030,6 +2110,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2047,6 +2136,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2056,6 +2148,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2073,6 +2174,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2082,6 +2186,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2099,6 +2212,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2108,6 +2224,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2125,6 +2250,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2134,6 +2262,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2151,6 +2288,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2160,6 +2300,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2177,6 +2326,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2186,6 +2338,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2203,6 +2364,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2212,6 +2376,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2229,6 +2402,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2238,6 +2414,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2255,6 +2440,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2367,7 +2555,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2672,6 +2860,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/helloworld/Makefile b/avr32new/packages/gtk2/examples/helloworld/Makefile index 7ce265316d..ad52e8c818 100644 --- a/avr32new/packages/gtk2/examples/helloworld/Makefile +++ b/avr32new/packages/gtk2/examples/helloworld/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=helloworld endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=helloworld endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=helloworld +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=helloworld endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=helloworld endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=helloworld +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/helloworld2/Makefile b/avr32new/packages/gtk2/examples/helloworld2/Makefile index 40785a20e9..694b12c181 100644 --- a/avr32new/packages/gtk2/examples/helloworld2/Makefile +++ b/avr32new/packages/gtk2/examples/helloworld2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=helloworld2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=helloworld2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=helloworld2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=helloworld2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=helloworld2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=helloworld2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/plugins/Makefile b/avr32new/packages/gtk2/examples/plugins/Makefile index a185e61b9f..de257c49b4 100644 --- a/avr32new/packages/gtk2/examples/plugins/Makefile +++ b/avr32new/packages/gtk2/examples/plugins/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=plugin main endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=plugin main endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=plugin main +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=plugin main endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=plugin main endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=plugin main +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/gtk2/examples/scribble_simple/Makefile b/avr32new/packages/gtk2/examples/scribble_simple/Makefile index a31c75cebd..3c9768b32c 100644 --- a/avr32new/packages/gtk2/examples/scribble_simple/Makefile +++ b/avr32new/packages/gtk2/examples/scribble_simple/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=scribble_simple endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=scribble_simple endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=scribble_simple +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=scribble_simple endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=scribble_simple endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=scribble_simple +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1642,6 +1676,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -1908,6 +1952,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1916,6 +1970,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1933,6 +1996,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2008,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -1959,6 +2034,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2046,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1985,6 +2072,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1994,6 +2084,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2011,6 +2110,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2020,6 +2122,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2037,6 +2148,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2046,6 +2160,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2063,6 +2186,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2072,6 +2198,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2089,6 +2224,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2098,6 +2236,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2115,6 +2262,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2124,6 +2274,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2141,6 +2300,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2150,6 +2312,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2167,6 +2338,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2279,7 +2453,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2584,6 +2758,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/hash/Makefile b/avr32new/packages/hash/Makefile index 873d6a72d2..91bede24de 100644 --- a/avr32new/packages/hash/Makefile +++ b/avr32new/packages/hash/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=hash override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=md5 crc ntlm sha1 uuid endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=md5 crc ntlm sha1 uuid +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=md5 crc ntlm sha1 uuid unixcrypt endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=md5 crc ntlm sha1 uuid unixcrypt endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=md5 crc ntlm sha1 uuid +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2314,6 +2378,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2512,6 +2577,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2587,6 +2655,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/hash/examples/Makefile b/avr32new/packages/hash/examples/Makefile index c59180460a..ee8f19221c 100644 --- a/avr32new/packages/hash/examples/Makefile +++ b/avr32new/packages/hash/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=mdtest crctest sha1test endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=mdtest crctest sha1test endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=mdtest crctest sha1test +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=mdtest crctest sha1test endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=mdtest crctest sha1test endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=mdtest crctest sha1test +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/hermes/Makefile b/avr32new/packages/hermes/Makefile index bbd9cd0a3c..2c89f8b05c 100644 --- a/avr32new/packages/hermes/Makefile +++ b/avr32new/packages/hermes/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/01/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=hermes override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=hermes endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=hermes +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=hermes endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=hermes endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=hermes +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-dI386_ASSEMBLER @@ -582,6 +611,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -657,6 +689,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -768,6 +803,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -843,6 +881,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -954,6 +995,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_TARGETDIR+=. endif @@ -1029,6 +1073,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_TARGETDIR+=. +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1375,6 +1422,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1911,6 +1963,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1986,6 +2041,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1994,6 +2052,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2011,6 +2078,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2123,7 +2193,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2500,6 +2570,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/httpd22/Makefile b/avr32new/packages/httpd22/Makefile index fd5ea46d1f..6a22bbb304 100644 --- a/avr32new/packages/httpd22/Makefile +++ b/avr32new/packages/httpd22/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=httpd22 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=apr apriconv aprutil httpd endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=apr apriconv aprutil httpd +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=apr apriconv aprutil httpd endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=apr apriconv aprutil httpd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=apr apriconv aprutil httpd +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src src/apr src/apriconv src/aprutil +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests src/apr src/apriconv src/aprutil +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/httpd22/examples/Makefile b/avr32new/packages/httpd22/examples/Makefile index d1371d2b0d..4a441be55a 100644 --- a/avr32new/packages/httpd22/examples/Makefile +++ b/avr32new/packages/httpd22/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=minimain endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=minimain endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=minimain +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=minimain endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=minimain endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=minimain +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1014,6 +1049,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1587,6 +1627,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HTTPD22=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 @@ -1687,6 +1731,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HTTPD22=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HTTPD22=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1695,6 +1743,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1712,6 +1769,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HTTPD22 PACKAGEDIR_HTTPD22:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /httpd22/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1721,6 +1781,15 @@ UNITDIR_HTTPD22=$(PACKAGEDIR_HTTPD22)/units/$(TARGETSUFFIX) else UNITDIR_HTTPD22=$(PACKAGEDIR_HTTPD22) endif +ifneq ($(wildcard $(PACKAGEDIR_HTTPD22)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HTTPD22=$(PACKAGEDIR_HTTPD22)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HTTPD22)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HTTPD22=$(PACKAGEDIR_HTTPD22)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HTTPD22=$(PACKAGEDIR_HTTPD22) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HTTPD22)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HTTPD22) $(FPCMADE) @@ -1738,6 +1807,9 @@ endif ifdef UNITDIR_HTTPD22 override COMPILER_UNITDIR+=$(UNITDIR_HTTPD22) endif +ifdef UNITDIR_FPMAKE_HTTPD22 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HTTPD22) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1850,7 +1922,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2164,6 +2236,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/ibase/Makefile b/avr32new/packages/ibase/Makefile index 8dcd874929..2b0aac2ad4 100644 --- a/avr32new/packages/ibase/Makefile +++ b/avr32new/packages/ibase/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ibase override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ibase40 ibase60 ibase60dyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ibase40 ibase60 ibase60dyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ibase40 ibase60 ibase60dyn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/ibase/examples/Makefile b/avr32new/packages/ibase/examples/Makefile index 8b470686d2..012e625de7 100644 --- a/avr32new/packages/ibase/examples/Makefile +++ b/avr32new/packages/ibase/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testib40 testib60 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testib40 testib60 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testib40 testib60 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testib40 testib60 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testib40 testib60 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testib40 testib60 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_IBASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_IBASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/iconvenc/Makefile b/avr32new/packages/iconvenc/Makefile index 7e2b05f9da..c0ed69932f 100644 --- a/avr32new/packages/iconvenc/Makefile +++ b/avr32new/packages/iconvenc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=iconvenc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=iconvenc iconvenc_dyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=iconvenc iconvenc_dyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=iconvenc iconvenc_dyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=iconvenc iconvenc_dyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=iconvenc iconvenc_dyn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -937,6 +978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1012,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1391,6 +1438,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1927,6 +1979,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2002,6 +2057,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2010,6 +2068,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2027,6 +2094,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2139,7 +2209,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2540,6 +2610,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2738,6 +2809,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2813,6 +2887,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/iconvenc/examples/Makefile b/avr32new/packages/iconvenc/examples/Makefile index a95eec652b..48e9bde574 100644 --- a/avr32new/packages/iconvenc/examples/Makefile +++ b/avr32new/packages/iconvenc/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=iconvtest endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=iconvtest endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=iconvtest +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=iconvtest endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=iconvtest endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=iconvtest +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ICONVENC=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ICONVENC=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ICONVENC=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ICONVENC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ICONVENC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/imagemagick/Makefile b/avr32new/packages/imagemagick/Makefile index 70d0ba06f8..32cf4a3db9 100644 --- a/avr32new/packages/imagemagick/Makefile +++ b/avr32new/packages/imagemagick/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=imagemagick override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=buildim endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=buildim +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=buildim endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildim endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildim +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=magick_wand imagemagick +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=magick_wand imagemagick endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=magick_wand imagemagick +endif override INSTALL_BUILDUNIT=buildgtk2 override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -937,6 +978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1012,6 +1056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1391,6 +1438,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1927,6 +1979,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2002,6 +2057,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2010,6 +2068,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2027,6 +2094,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2139,7 +2209,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2522,6 +2592,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/imlib/Makefile b/avr32new/packages/imlib/Makefile index e53da1c8f8..a7b353ba64 100644 --- a/avr32new/packages/imlib/Makefile +++ b/avr32new/packages/imlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=imlib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gdk_imlib imlib endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gdk_imlib imlib +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gdk_imlib imlib endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gdk_imlib imlib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gdk_imlib imlib +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -565,6 +594,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -640,6 +672,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1205,6 +1246,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1852,6 +1898,12 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2002,6 +2054,12 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_X11=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2010,6 +2068,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2027,6 +2094,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2036,6 +2106,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2053,6 +2132,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2062,6 +2144,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2079,6 +2170,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2088,6 +2182,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -2105,6 +2208,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2217,7 +2323,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2600,6 +2706,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/ldap/Makefile b/avr32new/packages/ldap/Makefile index 15fcc06a6f..77da852704 100644 --- a/avr32new/packages/ldap/Makefile +++ b/avr32new/packages/ldap/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ldap override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=lber ldap endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=lber ldap +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=lber ldap endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=lber ldap endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=lber ldap +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1744,6 +1790,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1844,6 +1894,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1852,6 +1906,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1869,6 +1932,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1878,6 +1944,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1895,6 +1970,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2007,7 +2085,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2384,6 +2462,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libc/Makefile b/avr32new/packages/libc/Makefile index b8daa8dde6..47d5fc8267 100644 --- a/avr32new/packages/libc/Makefile +++ b/avr32new/packages/libc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=kerneldefs kernelioctl libc endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=kerneldefs kernelioctl libc +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=kerneldefs kernelioctl libc endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=kerneldefs kernelioctl libc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=kerneldefs kernelioctl libc +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1204,6 +1245,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1740,6 +1786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1815,6 +1864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1823,6 +1875,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1840,6 +1901,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1952,7 +2016,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2335,6 +2399,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libcurl/Makefile b/avr32new/packages/libcurl/Makefile index 65b5d0628e..364cf989a2 100644 --- a/avr32new/packages/libcurl/Makefile +++ b/avr32new/packages/libcurl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libcurl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=libcurl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=libcurl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=libcurl endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=libcurl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=libcurl +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/libcurl/examples/Makefile b/avr32new/packages/libcurl/examples/Makefile index 9aafb3331b..bd5534f0aa 100644 --- a/avr32new/packages/libcurl/examples/Makefile +++ b/avr32new/packages/libcurl/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testcurl teststream endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testcurl teststream endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testcurl teststream +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testcurl teststream endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testcurl teststream endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testcurl teststream +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBCURL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBCURL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBCURL=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBCURL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBCURL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_LIBCURL PACKAGEDIR_LIBCURL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX) else UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBCURL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBCURL) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_LIBCURL override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL) endif +ifdef UNITDIR_FPMAKE_LIBCURL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBCURL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libgd/Makefile b/avr32new/packages/libgd/Makefile index 4f4548170e..aac5e0ea62 100644 --- a/avr32new/packages/libgd/Makefile +++ b/avr32new/packages/libgd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libgd override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gd endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gd +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gd endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gd +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/libgd/examples/Makefile b/avr32new/packages/libgd/examples/Makefile index c5ebab1256..faf244de50 100644 --- a/avr32new/packages/libgd/examples/Makefile +++ b/avr32new/packages/libgd/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=gdtest gdtestcgi endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=gdtest gdtestcgi endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=gdtest gdtestcgi +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=gdtest gdtestcgi endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gdtest gdtestcgi endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gdtest gdtestcgi +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBGD=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBGD=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBGD=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBGD=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBGD=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_LIBGD PACKAGEDIR_LIBGD:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libgd/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_LIBGD=$(PACKAGEDIR_LIBGD)/units/$(TARGETSUFFIX) else UNITDIR_LIBGD=$(PACKAGEDIR_LIBGD) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBGD)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBGD=$(PACKAGEDIR_LIBGD)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBGD)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBGD=$(PACKAGEDIR_LIBGD)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBGD=$(PACKAGEDIR_LIBGD) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBGD)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBGD) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_LIBGD override COMPILER_UNITDIR+=$(UNITDIR_LIBGD) endif +ifdef UNITDIR_FPMAKE_LIBGD +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBGD) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/Makefile b/avr32new/packages/libogcfpc/Makefile index cbaf823f6a..f9efc930d1 100644 --- a/avr32new/packages/libogcfpc/Makefile +++ b/avr32new/packages/libogcfpc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,22 +266,801 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libogcfpc override PACKAGE_VERSION=2.5.1 BINUTILSPREFIX=powerpc-eabi- +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gctypes gccore debug mp3player fat asndlib aesndlib gcmodplay iso9660 network +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_EXAMPLEDIRS+=examples +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_SOURCEDIR+=src tests +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -611,7 +1390,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -622,19 +1401,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1176,7 +1949,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1571,6 +2344,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1658,9 +2432,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/libogcfpc/examples/Makefile b/avr32new/packages/libogcfpc/examples/Makefile index 067016b8a6..c5795dce96 100644 --- a/avr32new/packages/libogcfpc/examples/Makefile +++ b/avr32new/packages/libogcfpc/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=audio devices filesystem graphics template endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=audio devices filesystem graphics template +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,6 +1823,265 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -1422,6 +2089,188 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif ifdef TARGET_DIRS_AUDIO audio_all: $(MAKE) -C audio all diff --git a/avr32new/packages/libogcfpc/examples/audio/Makefile b/avr32new/packages/libogcfpc/examples/audio/Makefile index d1c9915059..8f6ce94b7e 100644 --- a/avr32new/packages/libogcfpc/examples/audio/Makefile +++ b/avr32new/packages/libogcfpc/examples/audio/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=modplay mp3player +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=modplay mp3player endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=modplay mp3player +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,10 +1823,262 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif ifdef TARGET_DIRS_MODPLAY modplay_all: $(MAKE) -C modplay all diff --git a/avr32new/packages/libogcfpc/examples/audio/modplay/Makefile b/avr32new/packages/libogcfpc/examples/audio/modplay/Makefile index 121e614ced..a74d27a9f6 100644 --- a/avr32new/packages/libogcfpc/examples/audio/modplay/Makefile +++ b/avr32new/packages/libogcfpc/examples/audio/modplay/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=modplay +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=modplay endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/audio/mp3player/Makefile b/avr32new/packages/libogcfpc/examples/audio/mp3player/Makefile index 67fe46672c..06f2d1619e 100644 --- a/avr32new/packages/libogcfpc/examples/audio/mp3player/Makefile +++ b/avr32new/packages/libogcfpc/examples/audio/mp3player/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=playmp3 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=playmp3 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/devices/Makefile b/avr32new/packages/libogcfpc/examples/devices/Makefile index a5def5a6d0..96945529db 100644 --- a/avr32new/packages/libogcfpc/examples/devices/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=network usbkeyboard usbgecko endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,11 +1823,326 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif ifdef TARGET_DIRS_NETWORK network_all: $(MAKE) -C network all diff --git a/avr32new/packages/libogcfpc/examples/devices/network/Makefile b/avr32new/packages/libogcfpc/examples/devices/network/Makefile index 49b8b2df9a..b1647a8d3b 100644 --- a/avr32new/packages/libogcfpc/examples/devices/network/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/network/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=sockettest +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=sockettest endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=sockettest +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,9 +1823,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_SOCKETTEST=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_SOCKETTEST=1 +endif ifdef TARGET_DIRS_SOCKETTEST sockettest_all: $(MAKE) -C sockettest all diff --git a/avr32new/packages/libogcfpc/examples/devices/network/sockettest/Makefile b/avr32new/packages/libogcfpc/examples/devices/network/sockettest/Makefile index 948d2a600f..3aa503444f 100644 --- a/avr32new/packages/libogcfpc/examples/devices/network/sockettest/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/network/sockettest/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=sockettest +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=sockettest endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/devices/usbgecko/Makefile b/avr32new/packages/libogcfpc/examples/devices/usbgecko/Makefile index 00745f8599..d2a151fb57 100644 --- a/avr32new/packages/libogcfpc/examples/devices/usbgecko/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/usbgecko/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=gdbstub +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=gdbstub endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=gdbstub +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,9 +1823,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_GDBSTUB=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_GDBSTUB=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_GDBSTUB=1 +endif ifdef TARGET_DIRS_GDBSTUB gdbstub_all: $(MAKE) -C gdbstub all diff --git a/avr32new/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile b/avr32new/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile index f4c0130786..4d063ded99 100644 --- a/avr32new/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=gdbstub +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=gdbstub endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/Makefile b/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/Makefile index f65f03b190..b7799db4e3 100644 --- a/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=basic_stdin +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=basic_stdin endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=basic_stdin +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,9 +1823,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_BASIC_STDIN=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_BASIC_STDIN=1 +endif ifdef TARGET_DIRS_BASIC_STDIN basic_stdin_all: $(MAKE) -C basic_stdin all diff --git a/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile b/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile index 4714d3140c..36273398e2 100644 --- a/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile +++ b/avr32new/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=basic_stdin endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/filesystem/Makefile b/avr32new/packages/libogcfpc/examples/filesystem/Makefile index 36ec4d06f2..026700eb27 100644 --- a/avr32new/packages/libogcfpc/examples/filesystem/Makefile +++ b/avr32new/packages/libogcfpc/examples/filesystem/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=directory +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=directory endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=directory +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,9 +1823,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_DIRECTORY=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_DIRECTORY=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_DIRECTORY=1 +endif ifdef TARGET_DIRS_DIRECTORY directory_all: $(MAKE) -C directory all diff --git a/avr32new/packages/libogcfpc/examples/filesystem/directory/Makefile b/avr32new/packages/libogcfpc/examples/filesystem/directory/Makefile index c14435bb8f..4722f93644 100644 --- a/avr32new/packages/libogcfpc/examples/filesystem/directory/Makefile +++ b/avr32new/packages/libogcfpc/examples/filesystem/directory/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=directory +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=directory endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/Makefile b/avr32new/packages/libogcfpc/examples/graphics/Makefile index 7b28d1458a..1849c36a80 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=gx +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=gx endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=gx +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,9 +1823,198 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_GX=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_GX=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_GX=1 +endif ifdef TARGET_DIRS_GX gx_all: $(MAKE) -C gx all diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/Makefile index 2b049e92fe..9e8cca1a5e 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=gxSprites neheGX triangle endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=gxSprites neheGX triangle +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,11 +1823,326 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif ifdef TARGET_DIRS_GXSPRITES gxSprites_all: $(MAKE) -C gxSprites all diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile index fe85b79baf..2d145e7082 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures SCF_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) TPL_FILES = $(basename $(SCF_FILES)).tpl +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=gxsprites +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=gxsprites endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile index 7022b5bab2..de8ae23b83 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -245,7 +245,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -264,9 +264,221 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -595,7 +807,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -606,19 +818,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1050,9 +1256,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1061,6 +1456,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1078,6 +1482,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1190,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1328,6 +1735,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1415,6 +1823,413 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs +ifeq ($(FULL_TARGET),i386-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -1426,6 +2241,292 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif ifdef TARGET_DIRS_LESSON1 lesson1_all: $(MAKE) -C lesson1 all diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile index 4f82c81757..cf25a37c8b 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson1 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson1 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile index 108d4a582b..5bee36c8b6 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson2 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson2 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile index b6228cb797..1fe3857d50 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson3 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson3 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile index ccfe79f827..72839966be 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson4 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson4 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile index 3484f20efd..6e011b0585 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson5 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson5 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile index a76476280b..99af4d908e 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures SCF_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) TPL_FILES = $(basename $(SCF_FILES)).tpl +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson6 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson6 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile index 97a1d91878..77a9a139fd 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures SCF_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) TPL_FILES = $(basename $(SCF_FILES)).tpl +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson7 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson7 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile index db45651d12..4688f17825 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures SCF_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) TPL_FILES = $(basename $(SCF_FILES)).tpl +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson8 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson8 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile index 3b3dcdb190..44233e6e56 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures SCF_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) TPL_FILES = $(basename $(SCF_FILES)).tpl +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=lesson9 +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=lesson9 endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/graphics/gx/triangle/Makefile b/avr32new/packages/libogcfpc/examples/graphics/gx/triangle/Makefile index 602d19505f..9acfb57c5f 100644 --- a/avr32new/packages/libogcfpc/examples/graphics/gx/triangle/Makefile +++ b/avr32new/packages/libogcfpc/examples/graphics/gx/triangle/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=triangle +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=triangle endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libogcfpc/examples/template/Makefile b/avr32new/packages/libogcfpc/examples/template/Makefile index 6d2397731f..9bdcb4e95d 100644 --- a/avr32new/packages/libogcfpc/examples/template/Makefile +++ b/avr32new/packages/libogcfpc/examples/template/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=powerpc-wii +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,25 +266,804 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif BUILD = build INC = inc DATA = data TEXTURES = textures TPL_FILES = $(foreach dir,textures,$(notdir $(wildcard $(dir)/*.scf))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) +ifeq ($(FULL_TARGET),i386-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-win32) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-os2) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-beos) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-haiku) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-solaris) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-qnx) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-netware) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-emx) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-watcom) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-symbian) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-atari) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override TARGET_PROGRAMS+=template +endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_PROGRAMS+=template endif +ifeq ($(FULL_TARGET),sparc-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-palmos) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-nds) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),arm-symbian) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),avr-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),i386-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-win32) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-os2) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-beos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-haiku) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-qnx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netware) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-emx) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-watcom) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-nativent) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-atari) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc-wii) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),sparc-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-palmos) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-nds) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),arm-symbian) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -612,7 +1391,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -623,19 +1402,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1067,9 +1840,198 @@ TAROPT=vz TAREXT=.tar.gz endif override REQUIRE_PACKAGES=libogcfpc +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-haiku) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-nativent) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_LIBOGCFPC=1 endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),mipsel-linux) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_LIBOGCFPC=1 +endif ifdef REQUIRE_PACKAGES_LIBOGCFPC PACKAGEDIR_LIBOGCFPC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libogcfpc/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_LIBOGCFPC),) @@ -1078,6 +2040,15 @@ UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(TARGETSUFFIX) else UNITDIR_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBOGCFPC=$(PACKAGEDIR_LIBOGCFPC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBOGCFPC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBOGCFPC) $(FPCMADE) @@ -1095,6 +2066,9 @@ endif ifdef UNITDIR_LIBOGCFPC override COMPILER_UNITDIR+=$(UNITDIR_LIBOGCFPC) endif +ifdef UNITDIR_FPMAKE_LIBOGCFPC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBOGCFPC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1207,7 +2181,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1506,6 +2480,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libpng/Makefile b/avr32new/packages/libpng/Makefile index 47a28257d7..c15f21cd99 100644 --- a/avr32new/packages/libpng/Makefile +++ b/avr32new/packages/libpng/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libpng override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=png endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=png +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=png endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=png endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=png +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1204,6 +1245,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1777,6 +1823,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ZLIB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 @@ -1877,6 +1927,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ZLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ZLIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1885,6 +1939,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1902,6 +1965,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_ZLIB PACKAGEDIR_ZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /zlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1911,6 +1977,15 @@ UNITDIR_ZLIB=$(PACKAGEDIR_ZLIB)/units/$(TARGETSUFFIX) else UNITDIR_ZLIB=$(PACKAGEDIR_ZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_ZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ZLIB=$(PACKAGEDIR_ZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ZLIB=$(PACKAGEDIR_ZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ZLIB=$(PACKAGEDIR_ZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ZLIB) $(FPCMADE) @@ -1928,6 +2003,9 @@ endif ifdef UNITDIR_ZLIB override COMPILER_UNITDIR+=$(UNITDIR_ZLIB) endif +ifdef UNITDIR_FPMAKE_ZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ZLIB) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2040,7 +2118,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2423,6 +2501,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/librsvg/Makefile b/avr32new/packages/librsvg/Makefile index 68901ffb9d..8aedff901f 100644 --- a/avr32new/packages/librsvg/Makefile +++ b/avr32new/packages/librsvg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rsvg override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=rsvg endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=rsvg +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=rsvg endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=rsvg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=rsvg +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2016,6 +2062,16 @@ REQUIRE_PACKAGES_FCL-IMAGE=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASJPEG=1 @@ -2282,6 +2338,16 @@ REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_CAIRO=1 REQUIRE_PACKAGES_GTK2=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_CAIRO=1 +REQUIRE_PACKAGES_GTK2=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2290,6 +2356,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2307,6 +2382,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PASJPEG PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2316,6 +2394,15 @@ UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(TARGETSUFFIX) else UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) endif +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASJPEG=$(PACKAGEDIR_PASJPEG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASJPEG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASJPEG) $(FPCMADE) @@ -2333,6 +2420,9 @@ endif ifdef UNITDIR_PASJPEG override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG) endif +ifdef UNITDIR_FPMAKE_PASJPEG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASJPEG) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2342,6 +2432,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2359,6 +2458,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2368,6 +2470,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2385,6 +2496,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2394,6 +2508,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2411,6 +2534,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-IMAGE PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2420,6 +2546,15 @@ UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) @@ -2437,6 +2572,9 @@ endif ifdef UNITDIR_FCL-IMAGE override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) endif +ifdef UNITDIR_FPMAKE_FCL-IMAGE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2446,6 +2584,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2463,6 +2610,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_CAIRO PACKAGEDIR_CAIRO:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /cairo/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2472,6 +2622,15 @@ UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(TARGETSUFFIX) else UNITDIR_CAIRO=$(PACKAGEDIR_CAIRO) endif +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CAIRO=$(PACKAGEDIR_CAIRO) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CAIRO)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CAIRO) $(FPCMADE) @@ -2489,6 +2648,9 @@ endif ifdef UNITDIR_CAIRO override COMPILER_UNITDIR+=$(UNITDIR_CAIRO) endif +ifdef UNITDIR_FPMAKE_CAIRO +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CAIRO) +endif endif ifdef REQUIRE_PACKAGES_GTK2 PACKAGEDIR_GTK2:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk2/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2498,6 +2660,15 @@ UNITDIR_GTK2=$(PACKAGEDIR_GTK2)/units/$(TARGETSUFFIX) else UNITDIR_GTK2=$(PACKAGEDIR_GTK2) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK2=$(PACKAGEDIR_GTK2) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK2)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK2) $(FPCMADE) @@ -2515,6 +2686,9 @@ endif ifdef UNITDIR_GTK2 override COMPILER_UNITDIR+=$(UNITDIR_GTK2) endif +ifdef UNITDIR_FPMAKE_GTK2 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK2) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2524,6 +2698,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2541,6 +2724,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2653,7 +2839,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3036,6 +3222,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libsee/Makefile b/avr32new/packages/libsee/Makefile index 382ae24e4b..6b277da1a4 100644 --- a/avr32new/packages/libsee/Makefile +++ b/avr32new/packages/libsee/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libsee override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=libsee endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=libsee +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=libsee endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=libsee endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=libsee +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/libsee/examples/Makefile b/avr32new/packages/libsee/examples/Makefile index 94937361c1..277313a406 100644 --- a/avr32new/packages/libsee/examples/Makefile +++ b/avr32new/packages/libsee/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=teststream testwrite tlibsee +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=teststream testwrite tlibsee endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=teststream testwrite tlibsee +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=mod_stream teststream.pp testwrite.pp tlibsee.pp +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1014,6 +1049,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1587,6 +1627,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBSEE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBSEE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBSEE=1 @@ -1687,6 +1731,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBSEE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBSEE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1695,6 +1743,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1712,6 +1769,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_LIBSEE PACKAGEDIR_LIBSEE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libsee/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1721,6 +1781,15 @@ UNITDIR_LIBSEE=$(PACKAGEDIR_LIBSEE)/units/$(TARGETSUFFIX) else UNITDIR_LIBSEE=$(PACKAGEDIR_LIBSEE) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBSEE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBSEE=$(PACKAGEDIR_LIBSEE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBSEE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBSEE=$(PACKAGEDIR_LIBSEE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBSEE=$(PACKAGEDIR_LIBSEE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBSEE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBSEE) $(FPCMADE) @@ -1738,6 +1807,9 @@ endif ifdef UNITDIR_LIBSEE override COMPILER_UNITDIR+=$(UNITDIR_LIBSEE) endif +ifdef UNITDIR_FPMAKE_LIBSEE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBSEE) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1850,7 +1922,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2164,6 +2236,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/libxml/Makefile b/avr32new/packages/libxml/Makefile index 5200a0d7ab..d73716554b 100644 --- a/avr32new/packages/libxml/Makefile +++ b/avr32new/packages/libxml/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/01/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=libxml2 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=xml2 xmlxsdparser xmlxsd endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=xml2 xmlxsdparser xmlxsd +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=xml2 xmlxsdparser xmlxsd endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=xml2 xmlxsdparser xmlxsd endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=xml2 xmlxsdparser xmlxsd +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2314,6 +2378,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2512,6 +2577,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2587,6 +2655,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/libxml/examples/Makefile b/avr32new/packages/libxml/examples/Makefile index 97910c20c1..77263d4de5 100644 --- a/avr32new/packages/libxml/examples/Makefile +++ b/avr32new/packages/libxml/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=reader1 reader2 io1 io2 tree1 tree2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1333,6 +1367,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1408,6 +1445,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1416,6 +1456,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1433,6 +1482,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1545,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1844,6 +1896,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/lua/Makefile b/avr32new/packages/lua/Makefile index 37255f94fa..e3ddf59743 100644 --- a/avr32new/packages/lua/Makefile +++ b/avr32new/packages/lua/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/09] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=lua override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=lua lualib lauxlib endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=lua lualib lauxlib +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=lua lualib lauxlib endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=lua lualib lauxlib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=lua lualib lauxlib +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/mad/Makefile b/avr32new/packages/mad/Makefile index c7149f78cc..e49a83152f 100644 --- a/avr32new/packages/mad/Makefile +++ b/avr32new/packages/mad/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=mad override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=mad endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=mad +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=mad endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=mad endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=mad +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/modplug/Makefile b/avr32new/packages/modplug/Makefile index cee2860016..304b5cba19 100644 --- a/avr32new/packages/modplug/Makefile +++ b/avr32new/packages/modplug/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=modplug override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=modplug endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=modplug +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=modplug endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=modplug endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=modplug +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/mysql/Makefile b/avr32new/packages/mysql/Makefile index 62a27a7b11..ee3a304c55 100644 --- a/avr32new/packages/mysql/Makefile +++ b/avr32new/packages/mysql/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=mysql override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn mysql51 mysql51dyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn mysql51 mysql51dyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn mysql51 mysql51dyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn mysql51 mysql51dyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=my4_sys mysql4_com mysql4_version mysql4 mysql4dyn mysql4_comdyn mysql3_com mysql3_version mysql3 mysql3_comdyn mysql3dyn mysql40 mysql40dyn mysql41 mysql41dyn mysql50 mysql50dyn mysql51 mysql51dyn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/mysql/examples/Makefile b/avr32new/packages/mysql/examples/Makefile index 927e990c9a..fcc61ded9b 100644 --- a/avr32new/packages/mysql/examples/Makefile +++ b/avr32new/packages/mysql/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testdb4 mysqls testdb3 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testdb4 mysqls testdb3 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testdb4 mysqls testdb3 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testdb4 mysqls testdb3 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testdb4 mysqls testdb3 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testdb4 mysqls testdb3 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_MYSQL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_MYSQL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_MYSQL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/ncurses/Makefile b/avr32new/packages/ncurses/Makefile index 4d3d4a39b9..921a315176 100644 --- a/avr32new/packages/ncurses/Makefile +++ b/avr32new/packages/ncurses/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ncurses override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ncurses panel ncrt ocrt menu form +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ncurses panel ncrt ocrt menu form +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/ncurses/examples/Makefile b/avr32new/packages/ncurses/examples/Makefile index db808c9e1d..4a20f2dd42 100644 --- a/avr32new/packages/ncurses/examples/Makefile +++ b/avr32new/packages/ncurses/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NCURSES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_NCURSES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NCURSES=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NCURSES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_NCURSES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_NCURSES PACKAGEDIR_NCURSES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ncurses/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_NCURSES=$(PACKAGEDIR_NCURSES)/units/$(TARGETSUFFIX) else UNITDIR_NCURSES=$(PACKAGEDIR_NCURSES) endif +ifneq ($(wildcard $(PACKAGEDIR_NCURSES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_NCURSES=$(PACKAGEDIR_NCURSES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_NCURSES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_NCURSES=$(PACKAGEDIR_NCURSES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_NCURSES=$(PACKAGEDIR_NCURSES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_NCURSES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_NCURSES) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_NCURSES override COMPILER_UNITDIR+=$(UNITDIR_NCURSES) endif +ifdef UNITDIR_FPMAKE_NCURSES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_NCURSES) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/newt/Makefile b/avr32new/packages/newt/Makefile index 321f43ed2d..a1e7a8876e 100644 --- a/avr32new/packages/newt/Makefile +++ b/avr32new/packages/newt/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=newt override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=newt endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=newt +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=newt endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=newt endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=newt +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/newt/examples/Makefile b/avr32new/packages/newt/examples/Makefile index 61c43214bd..627fbe2016 100644 --- a/avr32new/packages/newt/examples/Makefile +++ b/avr32new/packages/newt/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=newt1 newt2 newt3 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=newt1 newt2 newt3 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=newt1 newt2 newt3 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=newt1 newt2 newt3 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=newt1 newt2 newt3 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=newt1 newt2 newt3 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NEWT=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_NEWT=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NEWT=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_NEWT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_NEWT=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_NEWT PACKAGEDIR_NEWT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /newt/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_NEWT=$(PACKAGEDIR_NEWT)/units/$(TARGETSUFFIX) else UNITDIR_NEWT=$(PACKAGEDIR_NEWT) endif +ifneq ($(wildcard $(PACKAGEDIR_NEWT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_NEWT=$(PACKAGEDIR_NEWT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_NEWT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_NEWT=$(PACKAGEDIR_NEWT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_NEWT=$(PACKAGEDIR_NEWT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_NEWT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_NEWT) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_NEWT override COMPILER_UNITDIR+=$(UNITDIR_NEWT) endif +ifdef UNITDIR_FPMAKE_NEWT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_NEWT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/numlib/Makefile b/avr32new/packages/numlib/Makefile index e2f06d3b62..7de8899341 100644 --- a/avr32new/packages/numlib/Makefile +++ b/avr32new/packages/numlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=numlib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=typ omv dsl mdt det eig eigh1 eigh2 int inv iom ipf ode roo sle spe spl numlib +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/nvapi/Makefile b/avr32new/packages/nvapi/Makefile index 5067868990..d9c1e4e3ee 100644 --- a/avr32new/packages/nvapi/Makefile +++ b/avr32new/packages/nvapi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=nvapi override PACKAGE_VERSION=2.4.0 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=nvapi endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=nvapi +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=nvapi endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=nvapi endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=nvapi +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -565,6 +594,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -640,6 +672,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1174,6 +1215,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1710,6 +1756,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1785,6 +1834,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1793,6 +1845,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1810,6 +1871,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1922,7 +1986,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2299,6 +2363,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/objcrtl/Makefile b/avr32new/packages/objcrtl/Makefile index 2cf0b86b76..67a17d9aca 100644 --- a/avr32new/packages/objcrtl/Makefile +++ b/avr32new/packages/objcrtl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=obcjrtl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=objcrtl objcrtl10 objcrtl20 objcrtliphoneos objcrtlmacosx objcrtlutils +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/odbc/Makefile b/avr32new/packages/odbc/Makefile index 7fb3d83be5..7e75ee75eb 100644 --- a/avr32new/packages/odbc/Makefile +++ b/avr32new/packages/odbc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=odbc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=odbcsql odbcsqldyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=odbcsql odbcsqldyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=odbcsql odbcsqldyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=odbcsql odbcsqldyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=odbcsql odbcsqldyn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/odbc/examples/Makefile b/avr32new/packages/odbc/examples/Makefile index 5cfc212db3..8914679a24 100644 --- a/avr32new/packages/odbc/examples/Makefile +++ b/avr32new/packages/odbc/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testodbc endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testodbc endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testodbc +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testodbc endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testodbc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testodbc +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ODBC=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ODBC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ODBC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/oggvorbis/Makefile b/avr32new/packages/oggvorbis/Makefile index 24c9ea2296..5ca11fe7b7 100644 --- a/avr32new/packages/oggvorbis/Makefile +++ b/avr32new/packages/oggvorbis/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=oggvorbis override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ogg vorbis endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ogg vorbis +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ogg vorbis endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ogg vorbis endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ogg vorbis +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/openal/Makefile b/avr32new/packages/openal/Makefile index 88b4e9cd90..4ad774978f 100644 --- a/avr32new/packages/openal/Makefile +++ b/avr32new/packages/openal/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=openal override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=openal endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=openal +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=openal endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=openal endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=openal +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2500,6 +2570,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2698,6 +2769,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2773,6 +2847,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/openal/examples/Makefile b/avr32new/packages/openal/examples/Makefile index 827c1ff6ec..ac47ed2a30 100644 --- a/avr32new/packages/openal/examples/Makefile +++ b/avr32new/packages/openal/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=captureplaybackopenal wavopenal madopenal endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=captureplaybackopenal wavopenal endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=captureplaybackopenal wavopenal +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=captureplaybackopenal wavopenal madopenal endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=captureplaybackopenal wavopenal madopenal endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=captureplaybackopenal wavopenal +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1559,6 +1593,15 @@ REQUIRE_PACKAGES_DTS=1 REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENAL=1 +REQUIRE_PACKAGES_OGGVORBIS=1 +REQUIRE_PACKAGES_A52=1 +REQUIRE_PACKAGES_DTS=1 +REQUIRE_PACKAGES_MODPLUG=1 +REQUIRE_PACKAGES_MATROSKA=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENAL=1 @@ -1790,6 +1833,15 @@ REQUIRE_PACKAGES_MODPLUG=1 REQUIRE_PACKAGES_MATROSKA=1 REQUIRE_PACKAGES_MAD=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENAL=1 +REQUIRE_PACKAGES_OGGVORBIS=1 +REQUIRE_PACKAGES_A52=1 +REQUIRE_PACKAGES_DTS=1 +REQUIRE_PACKAGES_MODPLUG=1 +REQUIRE_PACKAGES_MATROSKA=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1798,6 +1850,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1815,6 +1876,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_OPENAL PACKAGEDIR_OPENAL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /openal/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1824,6 +1888,15 @@ UNITDIR_OPENAL=$(PACKAGEDIR_OPENAL)/units/$(TARGETSUFFIX) else UNITDIR_OPENAL=$(PACKAGEDIR_OPENAL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENAL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENAL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENAL=$(PACKAGEDIR_OPENAL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENAL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENAL) $(FPCMADE) @@ -1841,6 +1914,9 @@ endif ifdef UNITDIR_OPENAL override COMPILER_UNITDIR+=$(UNITDIR_OPENAL) endif +ifdef UNITDIR_FPMAKE_OPENAL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENAL) +endif endif ifdef REQUIRE_PACKAGES_OGGVORBIS PACKAGEDIR_OGGVORBIS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oggvorbis/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1850,6 +1926,15 @@ UNITDIR_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units/$(TARGETSUFFIX) else UNITDIR_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS) endif +ifneq ($(wildcard $(PACKAGEDIR_OGGVORBIS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OGGVORBIS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OGGVORBIS=$(PACKAGEDIR_OGGVORBIS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OGGVORBIS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OGGVORBIS) $(FPCMADE) @@ -1867,6 +1952,9 @@ endif ifdef UNITDIR_OGGVORBIS override COMPILER_UNITDIR+=$(UNITDIR_OGGVORBIS) endif +ifdef UNITDIR_FPMAKE_OGGVORBIS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OGGVORBIS) +endif endif ifdef REQUIRE_PACKAGES_A52 PACKAGEDIR_A52:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /a52/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1876,6 +1964,15 @@ UNITDIR_A52=$(PACKAGEDIR_A52)/units/$(TARGETSUFFIX) else UNITDIR_A52=$(PACKAGEDIR_A52) endif +ifneq ($(wildcard $(PACKAGEDIR_A52)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_A52)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_A52=$(PACKAGEDIR_A52) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_A52)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_A52) $(FPCMADE) @@ -1893,6 +1990,9 @@ endif ifdef UNITDIR_A52 override COMPILER_UNITDIR+=$(UNITDIR_A52) endif +ifdef UNITDIR_FPMAKE_A52 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_A52) +endif endif ifdef REQUIRE_PACKAGES_DTS PACKAGEDIR_DTS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /dts/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1902,6 +2002,15 @@ UNITDIR_DTS=$(PACKAGEDIR_DTS)/units/$(TARGETSUFFIX) else UNITDIR_DTS=$(PACKAGEDIR_DTS) endif +ifneq ($(wildcard $(PACKAGEDIR_DTS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_DTS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_DTS=$(PACKAGEDIR_DTS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_DTS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_DTS) $(FPCMADE) @@ -1919,6 +2028,9 @@ endif ifdef UNITDIR_DTS override COMPILER_UNITDIR+=$(UNITDIR_DTS) endif +ifdef UNITDIR_FPMAKE_DTS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_DTS) +endif endif ifdef REQUIRE_PACKAGES_MODPLUG PACKAGEDIR_MODPLUG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /modplug/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1928,6 +2040,15 @@ UNITDIR_MODPLUG=$(PACKAGEDIR_MODPLUG)/units/$(TARGETSUFFIX) else UNITDIR_MODPLUG=$(PACKAGEDIR_MODPLUG) endif +ifneq ($(wildcard $(PACKAGEDIR_MODPLUG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MODPLUG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MODPLUG=$(PACKAGEDIR_MODPLUG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MODPLUG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MODPLUG) $(FPCMADE) @@ -1945,6 +2066,9 @@ endif ifdef UNITDIR_MODPLUG override COMPILER_UNITDIR+=$(UNITDIR_MODPLUG) endif +ifdef UNITDIR_FPMAKE_MODPLUG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MODPLUG) +endif endif ifdef REQUIRE_PACKAGES_MATROSKA PACKAGEDIR_MATROSKA:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /matroska/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1954,6 +2078,15 @@ UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA)/units/$(TARGETSUFFIX) else UNITDIR_MATROSKA=$(PACKAGEDIR_MATROSKA) endif +ifneq ($(wildcard $(PACKAGEDIR_MATROSKA)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MATROSKA)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MATROSKA=$(PACKAGEDIR_MATROSKA) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MATROSKA)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MATROSKA) $(FPCMADE) @@ -1971,6 +2104,9 @@ endif ifdef UNITDIR_MATROSKA override COMPILER_UNITDIR+=$(UNITDIR_MATROSKA) endif +ifdef UNITDIR_FPMAKE_MATROSKA +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MATROSKA) +endif endif ifdef REQUIRE_PACKAGES_MAD PACKAGEDIR_MAD:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mad/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1980,6 +2116,15 @@ UNITDIR_MAD=$(PACKAGEDIR_MAD)/units/$(TARGETSUFFIX) else UNITDIR_MAD=$(PACKAGEDIR_MAD) endif +ifneq ($(wildcard $(PACKAGEDIR_MAD)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MAD)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MAD=$(PACKAGEDIR_MAD) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MAD)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MAD) $(FPCMADE) @@ -1997,6 +2142,9 @@ endif ifdef UNITDIR_MAD override COMPILER_UNITDIR+=$(UNITDIR_MAD) endif +ifdef UNITDIR_FPMAKE_MAD +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MAD) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2109,7 +2257,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2408,6 +2556,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/opencl/Makefile b/avr32new/packages/opencl/Makefile index 911a1ba953..6f43f73ca8 100644 --- a/avr32new/packages/opencl/Makefile +++ b/avr32new/packages/opencl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=opencl override PACKAGE_VERSION=2.2.2 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=cl cl_gl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=cl cl_gl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=cl cl_gl endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=cl cl_gl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=cl cl_gl +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -565,6 +594,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -640,6 +672,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1205,6 +1246,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1790,6 +1836,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1901,6 +1951,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1909,6 +1963,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1926,6 +1989,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1935,6 +2001,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1952,6 +2027,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1961,6 +2039,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -1978,6 +2065,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2090,7 +2180,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2473,6 +2563,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/opengl/Makefile b/avr32new/packages/opengl/Makefile index 245fcd8c19..e965f201e7 100644 --- a/avr32new/packages/opengl/Makefile +++ b/avr32new/packages/opengl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/12/10] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=opengl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=gl glu glut endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=gl glu glut +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=gl glu glut glx glext endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gl glu glut glx glext endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=gl glu glut +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=freeglut endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=freeglut endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=freeglut +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=freeglut endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=freeglut endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=freeglut +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1122,6 +1169,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1197,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1574,6 +1627,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2122,6 +2180,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2208,6 +2269,9 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2216,6 +2280,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2233,6 +2306,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2242,6 +2318,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2259,6 +2344,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2371,7 +2459,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2772,6 +2860,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2970,6 +3059,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -3045,6 +3137,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/opengl/examples/Makefile b/avr32new/packages/opengl/examples/Makefile index 37b3b1fada..f7680e74bd 100644 --- a/avr32new/packages/opengl/examples/Makefile +++ b/avr32new/packages/opengl/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/12/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -562,6 +591,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -637,6 +669,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1014,6 +1049,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1599,6 +1639,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1710,6 +1754,10 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1718,6 +1766,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1735,6 +1792,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1744,6 +1804,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1761,6 +1830,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1770,6 +1842,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -1787,6 +1868,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1899,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2204,6 +2288,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/opengles/Makefile b/avr32new/packages/opengles/Makefile index b7e2163f47..0ffc23ce68 100644 --- a/avr32new/packages/opengles/Makefile +++ b/avr32new/packages/opengles/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=opengles override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-iphonesim) @@ -383,6 +406,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -458,6 +484,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -570,6 +599,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -645,6 +677,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src examples endif @@ -756,6 +791,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src examples endif @@ -831,6 +869,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1177,6 +1218,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1713,6 +1759,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1788,6 +1837,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1796,6 +1848,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1813,6 +1874,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1925,7 +1989,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2320,6 +2384,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2518,6 +2583,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2593,6 +2661,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/opengles/examples/Makefile b/avr32new/packages/opengles/examples/Makefile index 1bfc8f4f78..6387639b08 100644 --- a/avr32new/packages/opengles/examples/Makefile +++ b/avr32new/packages/opengles/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=glutdemoes endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=glutdemoes endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=glutdemoes +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=glutdemoes endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=glutdemoes endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=glutdemoes +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -562,6 +591,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -637,6 +669,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -983,6 +1018,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1556,6 +1596,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGLES=1 @@ -1656,6 +1700,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OPENGLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OPENGLES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1664,6 +1712,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1681,6 +1738,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_OPENGLES PACKAGEDIR_OPENGLES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengles/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1690,6 +1750,15 @@ UNITDIR_OPENGLES=$(PACKAGEDIR_OPENGLES)/units/$(TARGETSUFFIX) else UNITDIR_OPENGLES=$(PACKAGEDIR_OPENGLES) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGLES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGLES=$(PACKAGEDIR_OPENGLES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGLES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGLES=$(PACKAGEDIR_OPENGLES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGLES=$(PACKAGEDIR_OPENGLES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGLES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGLES) $(FPCMADE) @@ -1707,6 +1776,9 @@ endif ifdef UNITDIR_OPENGLES override COMPILER_UNITDIR+=$(UNITDIR_OPENGLES) endif +ifdef UNITDIR_FPMAKE_OPENGLES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGLES) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1819,7 +1891,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2118,6 +2190,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/openssl/Makefile b/avr32new/packages/openssl/Makefile index 7acad67957..bed4b9c81a 100644 --- a/avr32new/packages/openssl/Makefile +++ b/avr32new/packages/openssl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=openssl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=openssl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=openssl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=openssl endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=openssl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=openssl +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/oracle/Makefile b/avr32new/packages/oracle/Makefile index 704a783cca..cf2133d318 100644 --- a/avr32new/packages/oracle/Makefile +++ b/avr32new/packages/oracle/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=oracle override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=oci ocidyn oratypes oraoci +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=oci ocidyn oratypes oraoci endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=oci ocidyn oratypes oraoci +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/oracle/examples/Makefile b/avr32new/packages/oracle/examples/Makefile index a64f92e9c5..58f2292872 100644 --- a/avr32new/packages/oracle/examples/Makefile +++ b/avr32new/packages/oracle/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=oraclew endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=oraclew endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=oraclew +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=oraclew endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=oraclew endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=oraclew +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=test01 endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=test01 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=test01 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=test01 endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=test01 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=test01 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1014,6 +1049,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1806,6 +1846,13 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-DB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ORACLE=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_ORACLE=1 @@ -2068,6 +2115,13 @@ REQUIRE_PACKAGES_ODBC=1 REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_PXLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_ORACLE=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-DB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2076,6 +2130,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2093,6 +2156,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_ORACLE PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2102,6 +2168,15 @@ UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) else UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) endif +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ORACLE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) @@ -2119,6 +2194,9 @@ endif ifdef UNITDIR_ORACLE override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) endif +ifdef UNITDIR_FPMAKE_ORACLE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2128,6 +2206,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2145,6 +2232,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2154,6 +2244,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2171,6 +2270,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2180,6 +2282,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2197,6 +2308,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-DB PACKAGEDIR_FCL-DB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2206,6 +2320,15 @@ UNITDIR_FCL-DB=$(PACKAGEDIR_FCL-DB)/units/$(TARGETSUFFIX) else UNITDIR_FCL-DB=$(PACKAGEDIR_FCL-DB) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-DB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-DB=$(PACKAGEDIR_FCL-DB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-DB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-DB=$(PACKAGEDIR_FCL-DB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-DB=$(PACKAGEDIR_FCL-DB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-DB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-DB) $(FPCMADE) @@ -2223,6 +2346,9 @@ endif ifdef UNITDIR_FCL-DB override COMPILER_UNITDIR+=$(UNITDIR_FCL-DB) endif +ifdef UNITDIR_FPMAKE_FCL-DB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-DB) +endif endif ifdef REQUIRE_PACKAGES_IBASE PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2232,6 +2358,15 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) else UNITDIR_IBASE=$(PACKAGEDIR_IBASE) endif +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_IBASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) @@ -2249,6 +2384,9 @@ endif ifdef UNITDIR_IBASE override COMPILER_UNITDIR+=$(UNITDIR_IBASE) endif +ifdef UNITDIR_FPMAKE_IBASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2258,6 +2396,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -2275,6 +2422,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifdef REQUIRE_PACKAGES_MYSQL PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2284,6 +2434,15 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) else UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) endif +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_MYSQL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) @@ -2301,6 +2460,9 @@ endif ifdef UNITDIR_MYSQL override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) endif +ifdef UNITDIR_FPMAKE_MYSQL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) +endif endif ifdef REQUIRE_PACKAGES_ODBC PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2310,6 +2472,15 @@ UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) else UNITDIR_ODBC=$(PACKAGEDIR_ODBC) endif +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ODBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) @@ -2327,6 +2498,9 @@ endif ifdef UNITDIR_ODBC override COMPILER_UNITDIR+=$(UNITDIR_ODBC) endif +ifdef UNITDIR_FPMAKE_ODBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) +endif endif ifdef REQUIRE_PACKAGES_SQLITE PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2336,6 +2510,15 @@ UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) else UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) endif +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SQLITE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) @@ -2353,6 +2536,9 @@ endif ifdef UNITDIR_SQLITE override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) endif +ifdef UNITDIR_FPMAKE_SQLITE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) +endif endif ifdef REQUIRE_PACKAGES_PXLIB PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2362,6 +2548,15 @@ UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) else UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PXLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) @@ -2379,6 +2574,9 @@ endif ifdef UNITDIR_PXLIB override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) endif +ifdef UNITDIR_FPMAKE_PXLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PXLIB) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2388,6 +2586,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2405,6 +2612,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2517,7 +2727,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2832,6 +3042,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/os2units/Makefile b/avr32new/packages/os2units/Makefile index 1a3209986d..50d2af5217 100644 --- a/avr32new/packages/os2units/Makefile +++ b/avr32new/packages/os2units/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=os2units override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildall clkdll dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio sw +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/os2units/examples/Makefile b/avr32new/packages/os2units/examples/Makefile index 4dff3e85bd..a56744c164 100644 --- a/avr32new/packages/os2units/examples/Makefile +++ b/avr32new/packages/os2units/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=clktest ftptest lvmtest mciapi1 mciapi2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OS2UNITS=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_OS2UNITS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_OS2UNITS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_OS2UNITS PACKAGEDIR_OS2UNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /os2units/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_OS2UNITS=$(PACKAGEDIR_OS2UNITS)/units/$(TARGETSUFFIX) else UNITDIR_OS2UNITS=$(PACKAGEDIR_OS2UNITS) endif +ifneq ($(wildcard $(PACKAGEDIR_OS2UNITS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OS2UNITS=$(PACKAGEDIR_OS2UNITS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OS2UNITS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OS2UNITS=$(PACKAGEDIR_OS2UNITS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OS2UNITS=$(PACKAGEDIR_OS2UNITS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OS2UNITS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OS2UNITS) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_OS2UNITS override COMPILER_UNITDIR+=$(UNITDIR_OS2UNITS) endif +ifdef UNITDIR_FPMAKE_OS2UNITS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OS2UNITS) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/palmunits/Makefile b/avr32new/packages/palmunits/Makefile index bfa4fe153a..dca17cb1d8 100644 --- a/avr32new/packages/palmunits/Makefile +++ b/avr32new/packages/palmunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=palmunits override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=aboutbox alarmmgr applaunchcmd attentionmgr bitmap category chars clipboard connectionmgr consolemgr control coretraps crc datamgr datetime day dlserver encrypt errorbase event_ exglib exgmgr expansionmgr fatalalert featuremgr field filestream find_ floatmgr font fontselect_ form fslib graffiti graffitireference graffitishift hal helper helperserviceclass hwrmiscflags imcutils inetmgr inspoint intlmgr irlib keyboard keymgr launcher libtraps list localemgr localize lz77mgr m68khwr memorymgr menu_ modemmgr netbitutils netmgr notifymgr overlaymgr palmcompatibility palmlocale palmos password pdiconst pdilib penmgr phonelookup preferences privaterecords progress rect scrollbar selday seltime seltimezone seriallinkmgr serialmgr serialmgrold slotdrvrlib smslib soundmgr stringmgr sysevent sysevtmgr systemmgr systemresources sysutil table telephonymgr telephonymgrtypes telephonymgrui textmgr textservicesmgr timemgr udamgr uicolor uicontrols uiresources vfsmgr window +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/pasjpeg/Makefile b/avr32new/packages/pasjpeg/Makefile index 79165e7756..423626a9a5 100644 --- a/avr32new/packages/pasjpeg/Makefile +++ b/avr32new/packages/pasjpeg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=pasjpeg override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=buildpasjpeg jctrans endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=buildpasjpeg jctrans +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=buildpasjpeg jctrans endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildpasjpeg jctrans endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildpasjpeg jctrans +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=jcapimin jcapistd jccoefct jccolor jcdctmgr jchuff jcinit jcmainct jcmarker jcmaster jcomapi jcparam jcphuff jcprepct jcsample jdapimin jdapistd jdatadst jdatasrc jdcoefct jdcolor jdct jddctmgr jdeferr jdhuff jdinput jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdsample jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jinclude jmemmgr jmemnobs jmorecfg jpeglib jquant1 jquant2 jutils +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=cjpeg demo djpeg jpegtran rdjpgcom +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2500,6 +2570,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/paszlib/Makefile b/avr32new/packages/paszlib/Makefile index c3751937fa..31287edbef 100644 --- a/avr32new/packages/paszlib/Makefile +++ b/avr32new/packages/paszlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=paszlib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=paszlib zip unzip zipper endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=paszlib zip unzip zipper +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=paszlib zip unzip zipper endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=paszlib zip unzip zipper endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=paszlib zip unzip zipper +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=adler gzio infblock infcodes inffast inftrees infutil trees zcompres zdeflate zinflate zbase zuncompr ziputils zstream +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1930,6 +1982,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -2030,6 +2086,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2038,6 +2098,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2055,6 +2124,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2064,6 +2136,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2081,6 +2162,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2193,7 +2277,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2588,6 +2672,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2786,6 +2871,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2861,6 +2949,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/paszlib/examples/Makefile b/avr32new/packages/paszlib/examples/Makefile index 7215b9ece7..5e557c314f 100644 --- a/avr32new/packages/paszlib/examples/Makefile +++ b/avr32new/packages/paszlib/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=minigzip example minizip miniunz +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=minigzip example minizip miniunz endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=minigzip example minizip miniunz +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1407,6 +1441,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 @@ -1532,6 +1571,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1540,6 +1584,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1557,6 +1610,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1566,6 +1622,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -1583,6 +1648,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1592,6 +1660,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -1609,6 +1686,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1721,7 +1801,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2020,6 +2100,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/pcap/Makefile b/avr32new/packages/pcap/Makefile index 48d6fe157f..d59b944b28 100644 --- a/avr32new/packages/pcap/Makefile +++ b/avr32new/packages/pcap/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=pcap override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=pcap endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=pcap +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=pcap endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=pcap endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=pcap +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/postgres/Makefile b/avr32new/packages/postgres/Makefile index 5e8c0aa914..8158026d98 100644 --- a/avr32new/packages/postgres/Makefile +++ b/avr32new/packages/postgres/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=postgres override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=dllist dllistdyn postgres postgres3 postgres3dyn +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/postgres/examples/Makefile b/avr32new/packages/postgres/examples/Makefile index 90358ac37b..21bb5b2535 100644 --- a/avr32new/packages/postgres/examples/Makefile +++ b/avr32new/packages/postgres/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testpg1 testpg2 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testpg1 testpg2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testpg1 testpg2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testpg1 testpg2 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testpg1 testpg2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testpg1 testpg2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_POSTGRES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_POSTGRES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_POSTGRES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_POSTGRES PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) else UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) endif +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_POSTGRES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_POSTGRES override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) endif +ifdef UNITDIR_FPMAKE_POSTGRES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/proj4/Makefile b/avr32new/packages/proj4/Makefile index 7561b07a53..2da13d7676 100644 --- a/avr32new/packages/proj4/Makefile +++ b/avr32new/packages/proj4/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=proj4 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=proj endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=proj +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=proj endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=proj endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=proj +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/ptc/Makefile b/avr32new/packages/ptc/Makefile index b057586310..e40d4e8e17 100644 --- a/avr32new/packages/ptc/Makefile +++ b/avr32new/packages/ptc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ptc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ptc ptcwrapper ptceventqueue endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ptc ptcwrapper ptceventqueue +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ptc ptcwrapper ptceventqueue endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ptc ptcwrapper ptceventqueue endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ptc ptcwrapper ptceventqueue +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-go32v2) override COMPILER_UNITDIR+=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa @@ -765,6 +800,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src src/ptcwrapper endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src src/ptcwrapper +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src src/ptcwrapper endif @@ -840,6 +878,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src src/ptcwrapper endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src src/ptcwrapper +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1217,6 +1258,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1835,6 +1881,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HERMES=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HERMES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HERMES=1 @@ -1970,6 +2021,11 @@ REQUIRE_PACKAGES_HERMES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HERMES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1978,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1995,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HERMES PACKAGEDIR_HERMES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hermes/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2004,6 +2072,15 @@ UNITDIR_HERMES=$(PACKAGEDIR_HERMES)/units/$(TARGETSUFFIX) else UNITDIR_HERMES=$(PACKAGEDIR_HERMES) endif +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HERMES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HERMES) $(FPCMADE) @@ -2021,6 +2098,9 @@ endif ifdef UNITDIR_HERMES override COMPILER_UNITDIR+=$(UNITDIR_HERMES) endif +ifdef UNITDIR_FPMAKE_HERMES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HERMES) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2030,6 +2110,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2047,6 +2136,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2056,6 +2148,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2073,6 +2174,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2082,6 +2186,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2099,6 +2212,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2211,7 +2327,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2612,6 +2728,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2810,6 +2927,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2885,6 +3005,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/ptc/examples/Makefile b/avr32new/packages/ptc/examples/Makefile index f5e8533e34..ef9e9fb294 100644 --- a/avr32new/packages/ptc/examples/Makefile +++ b/avr32new/packages/ptc/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/08] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=ptc-examples override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=area buffer clear clip con_info console fire flower hicolor image keyboard keyboard2 land lights modes mojo palette pixel random save stretch texwarp timer tunnel3d tunnel endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=area buffer clear clip con_info console fire flower hicolor image keyboard keyboard2 land lights modes mojo palette pixel random save stretch texwarp timer tunnel3d tunnel +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=area buffer clear clip con_info console fire flower hicolor image keyboard keyboard2 land lights modes mojo palette pixel random save stretch texwarp timer tunnel3d tunnel endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=area buffer clear clip con_info console fire flower hicolor image keyboard keyboard2 land lights modes mojo palette pixel random save stretch texwarp timer tunnel3d tunnel endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=area buffer clear clip con_info console fire flower hicolor image keyboard keyboard2 land lights modes mojo palette pixel random save stretch texwarp timer tunnel3d tunnel +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=../$(UNITTARGETDIRPREFIX) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1015,6 +1050,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1670,6 +1710,12 @@ REQUIRE_PACKAGES_HERMES=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_PTC=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HERMES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_PTC=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HERMES=1 @@ -1830,6 +1876,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_PTC=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HERMES=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_PTC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1838,6 +1890,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1855,6 +1916,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_HERMES PACKAGEDIR_HERMES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hermes/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1864,6 +1928,15 @@ UNITDIR_HERMES=$(PACKAGEDIR_HERMES)/units/$(TARGETSUFFIX) else UNITDIR_HERMES=$(PACKAGEDIR_HERMES) endif +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HERMES=$(PACKAGEDIR_HERMES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HERMES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HERMES) $(FPCMADE) @@ -1881,6 +1954,9 @@ endif ifdef UNITDIR_HERMES override COMPILER_UNITDIR+=$(UNITDIR_HERMES) endif +ifdef UNITDIR_FPMAKE_HERMES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HERMES) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1890,6 +1966,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1907,6 +1992,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1916,6 +2004,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1933,6 +2030,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_PTC PACKAGEDIR_PTC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ptc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1942,6 +2042,15 @@ UNITDIR_PTC=$(PACKAGEDIR_PTC)/units/$(TARGETSUFFIX) else UNITDIR_PTC=$(PACKAGEDIR_PTC) endif +ifneq ($(wildcard $(PACKAGEDIR_PTC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PTC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PTC=$(PACKAGEDIR_PTC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PTC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PTC) $(FPCMADE) @@ -1959,6 +2068,9 @@ endif ifdef UNITDIR_PTC override COMPILER_UNITDIR+=$(UNITDIR_PTC) endif +ifdef UNITDIR_FPMAKE_PTC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PTC) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1968,6 +2080,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1985,6 +2106,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2097,7 +2221,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2488,6 +2612,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/pthreads/Makefile b/avr32new/packages/pthreads/Makefile index 57f2d61bb8..2dea2563a8 100644 --- a/avr32new/packages/pthreads/Makefile +++ b/avr32new/packages/pthreads/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=pthreads override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=pthreads endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=pthreads +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=pthreads endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=pthreads endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=pthreads +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/pxlib/Makefile b/avr32new/packages/pxlib/Makefile index e3bd978b31..fd2b4b557a 100644 --- a/avr32new/packages/pxlib/Makefile +++ b/avr32new/packages/pxlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=pxlib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -540,6 +563,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -615,6 +641,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -961,6 +990,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1497,6 +1531,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1572,6 +1609,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1580,6 +1620,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1597,6 +1646,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1709,7 +1761,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2104,6 +2156,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/pxlib/examples/Makefile b/avr32new/packages/pxlib/examples/Makefile index 80bd0ac94f..ab2de629a1 100644 --- a/avr32new/packages/pxlib/examples/Makefile +++ b/avr32new/packages/pxlib/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=ppxview endif @@ -689,6 +712,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1262,6 +1290,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PXLIB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 @@ -1362,6 +1394,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PXLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PXLIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1370,6 +1406,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1387,6 +1432,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PXLIB PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1396,6 +1444,15 @@ UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) else UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PXLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) @@ -1413,6 +1470,9 @@ endif ifdef UNITDIR_PXLIB override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) endif +ifdef UNITDIR_FPMAKE_PXLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PXLIB) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1525,7 +1585,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1824,6 +1884,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/regexpr/Makefile b/avr32new/packages/regexpr/Makefile index 055fd6e77e..a1a7bd56ab 100644 --- a/avr32new/packages/regexpr/Makefile +++ b/avr32new/packages/regexpr/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=regexpr override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=regex regexpr endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=regex regexpr +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=regex regexpr endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=regex regexpr endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=regex regexpr +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2 @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2 endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2 +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1122,6 +1169,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1197,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1543,6 +1596,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2079,6 +2137,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2154,6 +2215,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2162,6 +2226,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2179,6 +2252,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2291,7 +2367,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2686,6 +2762,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2884,6 +2961,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2959,6 +3039,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/regexpr/examples/Makefile b/avr32new/packages/regexpr/examples/Makefile index 4ad32a2bef..9756010a03 100644 --- a/avr32new/packages/regexpr/examples/Makefile +++ b/avr32new/packages/regexpr/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testreg1 endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testreg1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testreg1 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testreg1 endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testreg1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testreg1 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REGEXPR=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_REGEXPR=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REGEXPR=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REGEXPR=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_REGEXPR=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_REGEXPR PACKAGEDIR_REGEXPR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(TARGETSUFFIX) else UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR) endif +ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_REGEXPR)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_REGEXPR) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_REGEXPR override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR) endif +ifdef UNITDIR_FPMAKE_REGEXPR +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_REGEXPR) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/rexx/Makefile b/avr32new/packages/rexx/Makefile index 6c5a9d5175..e948481915 100644 --- a/avr32new/packages/rexx/Makefile +++ b/avr32new/packages/rexx/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rexx override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=rexxsaa endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=rexxsaa +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=rexxsaa endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=rexxsaa endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=rexxsaa +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2500,6 +2570,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2698,6 +2769,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2773,6 +2847,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/rexx/examples/Makefile b/avr32new/packages/rexx/examples/Makefile index 37686cd7f5..fda2cf789a 100644 --- a/avr32new/packages/rexx/examples/Makefile +++ b/avr32new/packages/rexx/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=callrexx endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=callrexx endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=callrexx +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=callrexx endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=callrexx endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=callrexx +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_REXX=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_REXX=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_REXX=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_REXX PACKAGEDIR_REXX:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rexx/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_REXX=$(PACKAGEDIR_REXX)/units/$(TARGETSUFFIX) else UNITDIR_REXX=$(PACKAGEDIR_REXX) endif +ifneq ($(wildcard $(PACKAGEDIR_REXX)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REXX=$(PACKAGEDIR_REXX)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_REXX)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_REXX=$(PACKAGEDIR_REXX)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_REXX=$(PACKAGEDIR_REXX) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_REXX)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_REXX) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_REXX override COMPILER_UNITDIR+=$(UNITDIR_REXX) endif +ifdef UNITDIR_FPMAKE_REXX +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_REXX) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/sdl/Makefile b/avr32new/packages/sdl/Makefile index 603c9a5980..2a4d2796cd 100644 --- a/avr32new/packages/sdl/Makefile +++ b/avr32new/packages/sdl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=sdl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1812,6 +1858,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PTHREADS=1 +REQUIRE_PACKAGES_X11=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 @@ -1937,6 +1988,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PTHREADS=1 +REQUIRE_PACKAGES_X11=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1945,6 +2001,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1962,6 +2027,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_PTHREADS PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1971,6 +2039,15 @@ UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(TARGETSUFFIX) else UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS) endif +ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PTHREADS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE) @@ -1988,6 +2065,9 @@ endif ifdef UNITDIR_PTHREADS override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS) endif +ifdef UNITDIR_FPMAKE_PTHREADS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PTHREADS) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1997,6 +2077,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2014,6 +2103,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2126,7 +2218,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2509,6 +2601,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/sqlite/Makefile b/avr32new/packages/sqlite/Makefile index 935934e91d..83ba671bd3 100644 --- a/avr32new/packages/sqlite/Makefile +++ b/avr32new/packages/sqlite/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=sqlite override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/svgalib/Makefile b/avr32new/packages/svgalib/Makefile index 9dbf6c21f8..c20052be3c 100644 --- a/avr32new/packages/svgalib/Makefile +++ b/avr32new/packages/svgalib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=svgalib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=svgalib vgamouse endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=svgalib vgamouse +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=svgalib vgamouse endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=svgalib vgamouse endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=svgalib vgamouse +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/svgalib/examples/Makefile b/avr32new/packages/svgalib/examples/Makefile index 6ad20058b8..f3ccb3d3d3 100644 --- a/avr32new/packages/svgalib/examples/Makefile +++ b/avr32new/packages/svgalib/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testvga vgatest endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testvga vgatest endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testvga vgatest +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testvga vgatest endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testvga vgatest endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testvga vgatest +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SVGALIB=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SVGALIB=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SVGALIB=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SVGALIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SVGALIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_SVGALIB PACKAGEDIR_SVGALIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /svgalib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_SVGALIB=$(PACKAGEDIR_SVGALIB)/units/$(TARGETSUFFIX) else UNITDIR_SVGALIB=$(PACKAGEDIR_SVGALIB) endif +ifneq ($(wildcard $(PACKAGEDIR_SVGALIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SVGALIB=$(PACKAGEDIR_SVGALIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SVGALIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SVGALIB=$(PACKAGEDIR_SVGALIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SVGALIB=$(PACKAGEDIR_SVGALIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SVGALIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SVGALIB) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_SVGALIB override COMPILER_UNITDIR+=$(UNITDIR_SVGALIB) endif +ifdef UNITDIR_FPMAKE_SVGALIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SVGALIB) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/symbolic/Makefile b/avr32new/packages/symbolic/Makefile index 635ef55200..f5b4dd1255 100644 --- a/avr32new/packages/symbolic/Makefile +++ b/avr32new/packages/symbolic/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=symbolic override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=symbolic endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=symbolic +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=symbolic endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=symbolic endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=symbolic +endif override INSTALL_FPCPACKAGE=y override INSTALL_FPCSUBDIR=packages ifeq ($(FULL_TARGET),i386-linux) @@ -565,6 +594,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -640,6 +672,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -751,6 +786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -826,6 +864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1205,6 +1246,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1741,6 +1787,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1816,6 +1865,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1824,6 +1876,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1841,6 +1902,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1953,7 +2017,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2336,6 +2400,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/syslog/Makefile b/avr32new/packages/syslog/Makefile index d729a8c625..b9f6350e12 100644 --- a/avr32new/packages/syslog/Makefile +++ b/avr32new/packages/syslog/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=syslog override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=systemlog endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=systemlog +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=systemlog endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=systemlog endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=systemlog +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1924,6 +1976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1999,6 +2054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2007,6 +2065,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2024,6 +2091,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2136,7 +2206,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2537,6 +2607,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2735,6 +2806,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2810,6 +2884,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/syslog/examples/Makefile b/avr32new/packages/syslog/examples/Makefile index eced5085fb..8bb5c01cba 100644 --- a/avr32new/packages/syslog/examples/Makefile +++ b/avr32new/packages/syslog/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testlog endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testlog endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testlog +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testlog endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testlog endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testlog +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SYSLOG=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SYSLOG=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SYSLOG=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_SYSLOG=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_SYSLOG=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_SYSLOG PACKAGEDIR_SYSLOG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /syslog/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_SYSLOG=$(PACKAGEDIR_SYSLOG)/units/$(TARGETSUFFIX) else UNITDIR_SYSLOG=$(PACKAGEDIR_SYSLOG) endif +ifneq ($(wildcard $(PACKAGEDIR_SYSLOG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SYSLOG=$(PACKAGEDIR_SYSLOG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_SYSLOG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_SYSLOG=$(PACKAGEDIR_SYSLOG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_SYSLOG=$(PACKAGEDIR_SYSLOG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_SYSLOG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_SYSLOG) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_SYSLOG override COMPILER_UNITDIR+=$(UNITDIR_SYSLOG) endif +ifdef UNITDIR_FPMAKE_SYSLOG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SYSLOG) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/tcl/Makefile b/avr32new/packages/tcl/Makefile index b912a85bd4..0e1ce6ea35 100644 --- a/avr32new/packages/tcl/Makefile +++ b/avr32new/packages/tcl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=tcl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=tcl80 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=tcl80 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=tcl80 endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=tcl80 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=tcl80 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=tcl_demo endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=tcl_demo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=tcl_demo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=tcl_demo endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=tcl_demo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=tcl_demo +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1966,6 +2018,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2069,6 +2125,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2077,6 +2137,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2094,6 +2163,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2103,6 +2175,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2120,6 +2201,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2129,6 +2213,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2146,6 +2239,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2258,7 +2354,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2659,6 +2755,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/univint/Makefile b/avr32new/packages/univint/Makefile index 8442822cf7..d5ff9630ce 100644 --- a/avr32new/packages/univint/Makefile +++ b/avr32new/packages/univint/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=univint override PACKAGE_VERSION=2.5.1 override FPCOPT+=-Mmacpas @@ -378,6 +401,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=MacOSAll MacOS endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=MacOSAll MacOS +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=MacOSAll MacOS endif @@ -453,6 +479,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=MacOSAll MacOS endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=MacOSAll MacOS +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr endif @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs AEDataModel AEHelpers AEInteraction AEMach AEObjects AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging ASRegistry ATSFont ATSLayoutTypes ATSTypes ATSUnicodeDirectAccess ATSUnicodeDrawing ATSUnicodeFlattening ATSUnicodeFonts ATSUnicodeGlyphs ATSUnicodeObjects ATSUnicodeTypes AUComponent AVLTree AXActionConstants AXAttributeConstants AXConstants AXErrors AXNotificationConstants AXRoleConstants AXTextAttributedString AXUIElement AXValue AXValueConstants Accessibility Aliases Appearance AppleDiskPartitions AppleEvents AppleHelp AppleScript AudioCodecs AudioComponents AudioHardware AudioOutputUnit AudioUnitCarbonViews AudioUnitParameters AudioUnitProperties AuthSession Authorization AuthorizationDB AuthorizationPlugin AuthorizationTags BackupCore CFArray CFAttributedString CFBag CFBase CFBinaryHeap CFBitVector CFBundle CFByteOrders CFCalendar CFCharacterSet CFData CFDate CFDateFormatter CFDictionary CFError CFFTPStream CFHTTPAuthentication CFHTTPMessage CFHTTPStream CFHost CFLocale CFMachPort CFMessagePort CFNetDiagnostics CFNetServices CFNetworkErrorss CFNotificationCenter CFNumber CFNumberFormatter CFPlugIn CFPlugInCOM CFPreferences CFPropertyList CFProxySupport CFRunLoop CFSet CFSocket CFSocketStream CFStream CFString CFStringEncodingExt CFStringTokenizer CFTimeZone CFTree CFURL CFURLAccess CFUUID CFUserNotification CFXMLNode CFXMLParser CGAffineTransforms CGBase CGBitmapContext CGColor CGColorSpace CGContext CGDataConsumer CGDataProvider CGDirectDisplay CGDirectPalette CGDisplayConfiguration CGDisplayFades CGErrors CGEvent CGEventSource CGEventTypes CGFont CGFunction CGGLContext CGGeometry CGGradient CGImage CGImageDestination CGImageProperties CGImageSource CGLCurrent CGLDevice CGLProfiler CGLProfilerFunctionEnums CGLRenderers CGLTypes CGLayer CGPDFArray CGPDFContentStream CGPDFContext CGPDFDictionary CGPDFDocument CGPDFObject CGPDFOperatorTable CGPDFPage CGPDFScanner CGPDFStream CGPDFString CGPSConverter CGPath CGPattern CGRemoteOperation CGSession CGShading CGWindow CGWindowLevels CMCalibrator CSIdentity CSIdentityAuthority CSIdentityQuery CTFont CTFontCollection CTFontDescriptor CTFontManager CTFontManagerErrors CTFontTraits CTFrame CTFramesetter CTGlyphInfo CTLine CTParagraphStyle CTRun CTStringAttributes CTTextTab CTTypesetter CVBase CVBuffer CVDisplayLink CVHostTime CVImageBuffer CVOpenGLBuffer CVOpenGLBufferPool CVOpenGLTexture CVOpenGLTextureCache CVPixelBuffer CVPixelBufferPool CVPixelFormatDescription CVReturns CarbonEvents CarbonEventsCore CodeFragments Collections ColorPicker ColorSyncCMM ColorSyncDeprecated ColorSyncDevice ColorSyncProfile ColorSyncTransform Components ConditionalMacros ControlDefinitions Controls CoreAudioTypes CoreFoundation CoreGraphics CoreText DADisk DASession DHCPClientPreferences DateTimeUtils Debugging Dialogs Dictionary DigitalHubRegistry Displays Drag DrawSprocket DriverServices DriverSynchronization Endian Events FSEvents FileTypesAndCreators Files Finder FinderRegistry FixMath Folders FontPanel FontSync Fonts GestaltEqu GPCStrings HFSVolumes HIAccessibility HIArchive HIButtonViews HIClockView HIComboBox HIContainerViews HIDataBrowser HIDisclosureViews HIGeometry HIImageViews HILittleArrows HIMenuView HIMovieView HIObject HIPopupButton HIProgressViews HIRelevanceBar HIScrollView HISearchField HISegmentedView HISeparator HIShape HISlider HITabbedView HITextLengthFilter HITextUtils HITextViews HITheme HIToolbar HIToolbox HIToolboxDebugging HIView HIWindowViews HTMLRendering HostTime IBCarbonRuntime ICAApplication ICACamera ICADevice IconStorage Icons IconsCore ImageCodec ImageCompression InternetConfig IntlResources IOKitReturn IOSurfaceAPI KeyEvents Keyboards KeychainCore KeychainHI LSInfo LSOpen LSQuarantine LSSharedFileList LanguageAnalysis Lists LowMem MDExternalDatastore MDImporter MDItem MDLineage MDQuery MDSchema MIDIDriver MIDIServices MIDISetup MIDIThruConnection MacApplication MacErrors MacHelp MacLocales MacMemory MacOSXPosix MacOpenGL MacTextEditor MacTypes MacWindows MachineExceptions Math64 MediaHandlers Menus MixedMode Movies MoviesFormat MultiProcessingInfo Multiprocessing MusicDevice NSL NSLCore Navigation Notification NumberFormatting OSA OSAComp OSAGeneric OSUtils ObjCRuntime OpenTransport OpenTransportProtocol OpenTransportProviders PEFBinaryFormat PLStringFuncs PMApplication PMApplicationDeprecated PMCore PMCoreDeprecated PMDefinitions PMDefinitionsDeprecated PMErrors PMPrintAETypes PMPrintSettingsKeys PMPrintingDialogExtensions Palettes Pasteboard PictUtils Power Processes QDCMCommon QDOffscreen QDPictToCGContext QLBase QLGenerator QLThumbnailImage QTML QTSMovie QTStreamingComponents QuickTimeComponents QuickTimeErrors QuickTimeMusic QuickTimeStreaming QuickTimeVR QuickTimeVRFormat Quickdraw QuickdrawText QuickdrawTypes Resources SCDynamicStore SCDynamicStoreCopyDHCPInfos SCDynamicStoreCopySpecific SCDynamicStoreKey SCNetwork SCNetworkConfiguration SCNetworkConnection SCNetworkReachability SCPreferences SCPreferencesPath SCPreferencesSetSpecific SCSI SCSchemaDefinitions SFNTLayoutTypes SFNTTypes ScalerStreamTypes Scrap Script SecBase SecTrust Sound SpeechRecognition SpeechSynthesis StringCompare SystemConfiguration SystemSound TSMTE TextCommon TextEdit TextEncodingConverter TextEncodingPlugin TextInputSources TextServices TextUtils Threads Timer ToolUtils Translation TranslationExtensions TranslationServices TypeSelect URLAccess UTCUtils UTCoreTypes UTType UnicodeConverter UnicodeUtilities UniversalAccess Video WSMethodInvocation WSProtocolHandler WSTypes cblas certextensions cssmapple cssmconfig cssmerr cssmkrapi cssmtype fenv fp gliContexts gliDispatch gluContext kern_return macgl macglext macglu mach_error vBLAS vDSP x509defs xattr +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_BUILDUNIT=MacOS override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -938,6 +979,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1013,6 +1057,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1124,6 +1171,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1199,6 +1249,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1545,6 +1598,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2081,6 +2139,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2156,6 +2217,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2164,6 +2228,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2181,6 +2254,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2293,7 +2369,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2688,6 +2764,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2886,6 +2963,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2961,6 +3041,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/univint/examples/Makefile b/avr32new/packages/univint/examples/Makefile index 8e032abd57..e40939e037 100644 --- a/avr32new/packages/univint/examples/Makefile +++ b/avr32new/packages/univint/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=controldemo endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=controldemo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=controldemo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=controldemo endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=controldemo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=controldemo +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=controldemo endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=controldemo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=controldemo +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=controldemo endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=controldemo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=controldemo +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -983,6 +1018,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1556,6 +1596,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UNIVINT=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 @@ -1656,6 +1700,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UNIVINT=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UNIVINT=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1664,6 +1712,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1681,6 +1738,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1690,6 +1750,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1707,6 +1776,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1819,7 +1891,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2118,6 +2190,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/unixutil/Makefile b/avr32new/packages/unixutil/Makefile index 9f27548d15..c128873fe6 100644 --- a/avr32new/packages/unixutil/Makefile +++ b/avr32new/packages/unixutil/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=unixutil override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=unixutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=unixutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=unixutils endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=unixutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=unixutils +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=unixutils endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=unixutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=unixutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=unixutils endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=unixutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=unixutils +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2001,6 +2053,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBC=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 @@ -2129,6 +2186,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_LIBC=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_LIBC=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2137,6 +2199,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2154,6 +2225,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_LIBC PACKAGEDIR_LIBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2163,6 +2237,15 @@ UNITDIR_LIBC=$(PACKAGEDIR_LIBC)/units/$(TARGETSUFFIX) else UNITDIR_LIBC=$(PACKAGEDIR_LIBC) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBC=$(PACKAGEDIR_LIBC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBC) $(FPCMADE) @@ -2180,6 +2263,9 @@ endif ifdef UNITDIR_LIBC override COMPILER_UNITDIR+=$(UNITDIR_LIBC) endif +ifdef UNITDIR_FPMAKE_LIBC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBC) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2189,6 +2275,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2206,6 +2301,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2215,6 +2313,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2232,6 +2339,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2344,7 +2454,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2727,6 +2837,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/unzip/Makefile b/avr32new/packages/unzip/Makefile index 81a1c84c6b..2303d3ad03 100644 --- a/avr32new/packages/unzip/Makefile +++ b/avr32new/packages/unzip/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=unzip override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=ziptypes unzip51g endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=ziptypes unzip51g +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=ziptypes unzip51g endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=ziptypes unzip51g endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=ziptypes unzip51g +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1171,6 +1212,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1707,6 +1753,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1782,6 +1831,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1790,6 +1842,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1807,6 +1868,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1919,7 +1983,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2296,6 +2360,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/users/Makefile b/avr32new/packages/users/Makefile index 9f4c87ee92..6b844351e6 100644 --- a/avr32new/packages/users/Makefile +++ b/avr32new/packages/users/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=users override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=grp pwd users endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=grp pwd users +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=grp pwd users shadow crypth endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=grp pwd users shadow crypth endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=grp pwd users +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1390,6 +1437,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1926,6 +1978,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2001,6 +2056,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2009,6 +2067,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2026,6 +2093,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2138,7 +2208,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2539,6 +2609,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2737,6 +2808,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2812,6 +2886,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/users/examples/Makefile b/avr32new/packages/users/examples/Makefile index f19ba7897f..c44af61ac4 100644 --- a/avr32new/packages/users/examples/Makefile +++ b/avr32new/packages/users/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testuser testpass2 testpass endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testuser testpass2 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testuser testpass2 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testuser testpass2 testpass endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testuser testpass2 testpass endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testuser testpass2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1401,6 +1435,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_USERS=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_USERS=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_USERS=1 @@ -1501,6 +1539,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_USERS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_USERS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1509,6 +1551,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1526,6 +1577,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_USERS PACKAGEDIR_USERS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /users/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1535,6 +1589,15 @@ UNITDIR_USERS=$(PACKAGEDIR_USERS)/units/$(TARGETSUFFIX) else UNITDIR_USERS=$(PACKAGEDIR_USERS) endif +ifneq ($(wildcard $(PACKAGEDIR_USERS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_USERS=$(PACKAGEDIR_USERS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_USERS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_USERS=$(PACKAGEDIR_USERS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_USERS=$(PACKAGEDIR_USERS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_USERS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_USERS) $(FPCMADE) @@ -1552,6 +1615,9 @@ endif ifdef UNITDIR_USERS override COMPILER_UNITDIR+=$(UNITDIR_USERS) endif +ifdef UNITDIR_FPMAKE_USERS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_USERS) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1664,7 +1730,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1969,6 +2035,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/utmp/Makefile b/avr32new/packages/utmp/Makefile index b365dbf113..8e199f4486 100644 --- a/avr32new/packages/utmp/Makefile +++ b/avr32new/packages/utmp/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=utmp override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=utmp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=utmp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=utmp endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=utmp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=utmp +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1357,6 +1404,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1893,6 +1945,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1968,6 +2023,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1976,6 +2034,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1993,6 +2060,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2105,7 +2175,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2500,6 +2570,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2698,6 +2769,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2773,6 +2847,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/utmp/examples/Makefile b/avr32new/packages/utmp/examples/Makefile index cfed0ebb12..7328e2ecf1 100644 --- a/avr32new/packages/utmp/examples/Makefile +++ b/avr32new/packages/utmp/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testutmp endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testutmp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testutmp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testutmp endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testutmp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testutmp +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UTMP=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UTMP=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UTMP=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UTMP=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UTMP=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_UTMP PACKAGEDIR_UTMP:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /utmp/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_UTMP=$(PACKAGEDIR_UTMP)/units/$(TARGETSUFFIX) else UNITDIR_UTMP=$(PACKAGEDIR_UTMP) endif +ifneq ($(wildcard $(PACKAGEDIR_UTMP)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UTMP=$(PACKAGEDIR_UTMP)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UTMP)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UTMP=$(PACKAGEDIR_UTMP)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UTMP=$(PACKAGEDIR_UTMP) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UTMP)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UTMP) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_UTMP override COMPILER_UNITDIR+=$(UNITDIR_UTMP) endif +ifdef UNITDIR_FPMAKE_UTMP +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UTMP) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/uuid/Makefile b/avr32new/packages/uuid/Makefile index 07d2011101..2dbdb06742 100644 --- a/avr32new/packages/uuid/Makefile +++ b/avr32new/packages/uuid/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=uuid override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=macuuid libuuid endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=macuuid libuuid +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=macuuid libuuid endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=macuuid libuuid endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=macuuid libuuid +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=units/$(OS_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=units/$(OS_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=units/$(OS_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1122,6 +1169,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1197,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1543,6 +1596,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2079,6 +2137,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2154,6 +2215,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2162,6 +2226,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2179,6 +2252,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2291,7 +2367,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2686,6 +2762,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -2884,6 +2961,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -2959,6 +3039,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/uuid/examples/Makefile b/avr32new/packages/uuid/examples/Makefile index 74dc3fb4e0..711ea323ff 100644 --- a/avr32new/packages/uuid/examples/Makefile +++ b/avr32new/packages/uuid/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=testuid testlibuid endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=testuid testlibuid endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=testuid testlibuid +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=testuid testlibuid endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=testuid testlibuid endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=testuid testlibuid +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1370,6 +1404,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UUID=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UUID=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UUID=1 @@ -1470,6 +1508,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_UUID=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_UUID=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1478,6 +1520,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1495,6 +1546,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_UUID PACKAGEDIR_UUID:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /uuid/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1504,6 +1558,15 @@ UNITDIR_UUID=$(PACKAGEDIR_UUID)/units/$(TARGETSUFFIX) else UNITDIR_UUID=$(PACKAGEDIR_UUID) endif +ifneq ($(wildcard $(PACKAGEDIR_UUID)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UUID=$(PACKAGEDIR_UUID)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UUID)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UUID=$(PACKAGEDIR_UUID)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UUID=$(PACKAGEDIR_UUID) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UUID)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UUID) $(FPCMADE) @@ -1521,6 +1584,9 @@ endif ifdef UNITDIR_UUID override COMPILER_UNITDIR+=$(UNITDIR_UUID) endif +ifdef UNITDIR_FPMAKE_UUID +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UUID) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1633,7 +1699,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1932,6 +1998,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/winceunits/Makefile b/avr32new/packages/winceunits/Makefile index 18dd7daed3..57072b45c3 100644 --- a/avr32new/packages/winceunits/Makefile +++ b/avr32new/packages/winceunits/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=winceunits override PACKAGE_VERSION=2.5.1 WINDIR=../winunits-base/src @@ -277,10 +300,10 @@ ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=comobj buildwinceunits endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleauto power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl sipapi cpl bt_api bt_sdp bthapi bthutil pimstore ril sms ws2bth keybd nled phone connmgr devload devmgmt mmreg mmsystem msacm wininet ras raserror sip projects wap tsp extapi imm activex ole2 comconst rapitypes +override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleauto power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl sipapi cpl bt_api bt_sdp bthapi bthutil pimstore ril sms ws2bth keybd nled phone connmgr devload devmgmt mmreg mmsystem msacm wininet ras raserror sip projects wap tsp extapi imm activex ole2 comconst rapitypes tlhelp32 endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleauto power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl sipapi cpl bt_api bt_sdp bthapi bthutil pimstore ril sms ws2bth keybd nled phone connmgr devload devmgmt mmreg mmsystem msacm wininet ras raserror sip projects wap tsp extapi imm activex ole2 comconst rapitypes +override TARGET_IMPLICITUNITS+=aygshell commctrl commdlg iphlpapi notify oleauto power shellapi simmgr tapi gpsapi todaycmn windbase cesync gx winioctl msgqueue pm service htmlctrl sipapi cpl bt_api bt_sdp bthapi bthutil pimstore ril sms ws2bth keybd nled phone connmgr devload devmgmt mmreg mmsystem msacm wininet ras raserror sip projects wap tsp extapi imm activex ole2 comconst rapitypes tlhelp32 endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=comconst @@ -393,6 +416,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=comconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=comconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=comconst endif @@ -468,6 +494,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=comconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=comconst +endif override INSTALL_BUILDUNIT=buildwinceunits override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -581,6 +610,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Ur endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Ur +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Ur endif @@ -656,6 +688,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Ur endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Ur +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -767,6 +802,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -842,6 +880,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1188,6 +1229,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1724,6 +1770,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1799,6 +1848,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1807,6 +1859,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1824,6 +1885,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1936,7 +2000,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2313,6 +2377,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/winunits-base/Makefile b/avr32new/packages/winunits-base/Makefile index b93e59aa77..4e54826389 100644 --- a/avr32new/packages/winunits-base/Makefile +++ b/avr32new/packages/winunits-base/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/15] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -107,36 +107,24 @@ FPC=$(PP) endif endif ifndef FPC -DETERMINE_NATIVE_COMPILER=1 -else -ifdef CROSSCOMPILE -ifndef FPCFPMAKE -DETERMINE_NATIVE_COMPILER=1 -endif -endif -endif -ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPCNATIVE:=$(shell $(FPCPROG) -PB) +FPC:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPCNATIVE)),) -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPC)),) +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPCNATIVE))),) -FPCNATIVE:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPC))),) +FPC:=$(firstword $(FPCPROG)) endif endif else -override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) -endif +override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif -ifndef FPC -FPC=$(FPCNATIVE) endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) @@ -279,15 +267,26 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F ifndef FPCFPMAKE ifdef CROSSCOMPILE ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) -FPCFPMAKE:=$(FPCNATIVE) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif else FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG endif else FPCFPMAKE=$(FPC) endif endif -export FPCFPMAKE override PACKAGE_NAME=winunits-base override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -479,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildwinutilsbase endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildwinutilsbase +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet uxtheme dwmapi multimon htmlhelp winutils comserv winspool imm imm_dyn nb30 win9xwsmanager endif @@ -668,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet uxtheme dwmapi multimon htmlhelp winutils comserv winspool imm imm_dyn nb30 win9xwsmanager endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp wininet uxtheme dwmapi multimon htmlhelp winutils comserv winspool imm imm_dyn nb30 win9xwsmanager +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=jwawintype comconst endif @@ -857,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=jwawintype comconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=jwawintype comconst +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=examples endif @@ -1046,6 +1054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=examples +endif override INSTALL_BUILDUNIT=buildwinutilsbase override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -1237,6 +1248,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Ur endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Ur +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1426,6 +1440,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2637,6 +2654,12 @@ REQUIRE_PACKAGES_ICONVENC=1 REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-REGISTRY=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-REGISTRY=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2976,7 +2999,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/packages/winunits-jedi/Makefile b/avr32new/packages/winunits-jedi/Makefile index 4e0ee80d18..5f5642b3d5 100644 --- a/avr32new/packages/winunits-jedi/Makefile +++ b/avr32new/packages/winunits-jedi/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=winunits-jedi override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=buildjwa endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=buildjwa +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=buildjwa endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=buildjwa endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=buildjwa +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=jwawintype jwawinbase jwawinnt jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname jwalmstats jwaaccctrl jwaaclapi jwacderr jwacpl jwaactiveds jwadbt jwadde jwaadserr jwaadshlp jwaadsnms jwaadsprop jwaadssts jwaadtgen jwaaf_irda jwaatalkwsh jwaauthif jwadlgs jwadssec jwabatclass jwaexcpt jwaime jwabits1_5 jwabitscfg jwabitsmsg jwablberr jwabluetoothapis jwabthdef jwabthsdpdef jwabugcodes jwalmat jwalmsvc jwacmnquery jwacolordlg jwalmuse jwamsi jwacplext jwacryptuiapi jwanb30 jwanetsh jwapbt jwapdh jwadhcpcsdk jwadhcpsapi jwadhcpssdk jwaprsht jwapsapi jwadsadmin jwadsclient jwadsgetdc jwadskquota jwadsquery jwadsrole jwaqos jwaqossp jwaerrorrep jwarpc jwasddl jwafaxdev jwafaxext jwafaxmmc jwafaxroute jwagpedit jwahherror jwahtmlguid jwahtmlhelp jwaiaccess jwaiadmext jwaicmpapi jwaiiscnfg jwaimagehlp jwalmdfs jwaimapierror jwasens jwasfc jwaioevent jwaipexport jwaiphlpapi jwaipifcons jwaipinfoid jwaiprtrmib jwaiptypes jwaisguids jwaissper16 jwalmaccess jwalmalert jwalmapibuf jwasnmp jwasspi jwalmaudit jwalmconfig jwalmcons jwawpapi jwawsipx jwawsrm jwalmuseflg jwalmwksta jwaloadperf jwalpmapi jwamciavi jwamprerror jwawsvns jwaimapi jwamsidefs jwamsiquery jwamstask jwamstcpip jwamswsock jwanspapi jwantddpar jwantdsapi jwantdsbcli jwantdsbmsg jwantldap jwantquery jwantsecapi jwantstatus jwaobjsel jwapatchapi jwapatchwiz jwapdhmsg jwapowrprof jwaprofinfo jwaprotocol jwaqosname jwaqospol jwareason jwaregstr jwarpcasync jwarpcdce jwarpcnsi jwarpcnterr jwarpcssl jwascesvc jwaschedule jwaschemadef jwasecext jwasecurity jwasensapi jwashlguid jwasisbkup jwasporder jwasrrestoreptapi jwasubauth jwasvcguid jwatlhelp32 jwatmschema jwatraffic jwauserenv jwauxtheme jwawbemcli jwawinable jwawinber jwawincon jwawincpl jwawincred jwawincrypt jwawindns jwawinefs jwawinerror jwawinfax jwawingdi jwawinioctl jwawinldap jwawinnetwk jwawinnls jwawinperf jwawinreg jwawinresrc jwawinsafer jwawinsock jwawinsock2 jwawinsvc jwawinuser jwawinver jwawinwlx jwawmistr jwawownt16 jwawownt32 jwawpapimsg jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts jwaadstlb jwanative jwawindows jwacarderr jwaactivex jwawindllnames jwawinternl jwawinsta jwavista +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=jwawintype endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=jwawintype endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=jwawintype +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=jwawintype endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=jwawintype endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=jwawintype +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=examples endif @@ -935,6 +976,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLES+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLES+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLES+=examples endif @@ -1010,6 +1054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLES+=examples +endif override INSTALL_BUILDUNIT=buildjwa override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -1123,6 +1170,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Ur endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Ur +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Ur endif @@ -1198,6 +1248,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Ur endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Ur +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1309,6 +1362,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1384,6 +1440,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=units endif @@ -1495,6 +1554,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=units endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=units +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=units endif @@ -1570,6 +1632,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=units endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=units +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src endif @@ -1681,6 +1746,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src endif @@ -1756,6 +1824,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2102,6 +2173,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2642,6 +2718,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2721,6 +2800,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -2729,6 +2811,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2746,6 +2837,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2755,6 +2849,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2772,6 +2875,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2781,6 +2887,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2798,6 +2913,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-REGISTRY PACKAGEDIR_FCL-REGISTRY:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-registry/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2807,6 +2925,15 @@ UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(TARGETSUFFIX) else UNITDIR_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-REGISTRY=$(PACKAGEDIR_FCL-REGISTRY) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-REGISTRY)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-REGISTRY) $(FPCMADE) @@ -2824,6 +2951,9 @@ endif ifdef UNITDIR_FCL-REGISTRY override COMPILER_UNITDIR+=$(UNITDIR_FCL-REGISTRY) endif +ifdef UNITDIR_FPMAKE_FCL-REGISTRY +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-REGISTRY) +endif endif ifdef REQUIRE_PACKAGES_WINUNITS-BASE PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2833,6 +2963,15 @@ UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX) else UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE) @@ -2850,6 +2989,9 @@ endif ifdef UNITDIR_WINUNITS-BASE override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE) endif +ifdef UNITDIR_FPMAKE_WINUNITS-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_WINUNITS-BASE) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2962,7 +3104,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3357,6 +3499,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/x11/Makefile b/avr32new/packages/x11/Makefile index 5600eab79a..255be1e312 100644 --- a/avr32new/packages/x11/Makefile +++ b/avr32new/packages/x11/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=x11 override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=x xlib xutil xresource xcms xshm xrender keysym xi xkb xkblib xatom xinerama xv xvlib cursorfont xrandr xf86dga xf86vmode +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1204,6 +1245,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1740,6 +1786,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1815,6 +1864,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1823,6 +1875,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1840,6 +1901,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1952,7 +2016,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2335,6 +2399,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/xforms/Makefile b/avr32new/packages/xforms/Makefile index 251bf6e1e0..195bda445e 100644 --- a/avr32new/packages/xforms/Makefile +++ b/avr32new/packages/xforms/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=xforms override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fd2pascal endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fd2pascal +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fd2pascal endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fd2pascal endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fd2pascal +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=xforms endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=xforms endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=xforms +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=xforms endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=xforms endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=xforms +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_EXAMPLEDIRS+=examples +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_EXAMPLEDIRS+=examples endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLEDIRS+=examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_EXAMPLEDIRS+=examples +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1122,6 +1169,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -1197,6 +1247,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1576,6 +1629,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2149,6 +2207,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -2249,6 +2311,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2257,6 +2323,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2274,6 +2349,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2283,6 +2361,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2300,6 +2387,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2412,7 +2502,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2830,6 +2920,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3028,6 +3119,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif @@ -3103,6 +3197,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_EXAMPLEDIRS_EXAMPLES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_EXAMPLEDIRS_EXAMPLES=1 +endif ifdef TARGET_EXAMPLEDIRS_EXAMPLES examples_all: $(MAKE) -C examples all diff --git a/avr32new/packages/xforms/examples/Makefile b/avr32new/packages/xforms/examples/Makefile index 9e94a40736..0dbfa27200 100644 --- a/avr32new/packages/xforms/examples/Makefile +++ b/avr32new/packages/xforms/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -828,6 +857,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1438,6 +1472,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_XFORMS=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 @@ -1563,6 +1602,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_XFORMS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_XFORMS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1571,6 +1615,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1588,6 +1641,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1597,6 +1653,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -1614,6 +1679,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_XFORMS PACKAGEDIR_XFORMS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /xforms/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1623,6 +1691,15 @@ UNITDIR_XFORMS=$(PACKAGEDIR_XFORMS)/units/$(TARGETSUFFIX) else UNITDIR_XFORMS=$(PACKAGEDIR_XFORMS) endif +ifneq ($(wildcard $(PACKAGEDIR_XFORMS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_XFORMS=$(PACKAGEDIR_XFORMS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_XFORMS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_XFORMS=$(PACKAGEDIR_XFORMS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_XFORMS=$(PACKAGEDIR_XFORMS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_XFORMS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_XFORMS) $(FPCMADE) @@ -1640,6 +1717,9 @@ endif ifdef UNITDIR_XFORMS override COMPILER_UNITDIR+=$(UNITDIR_XFORMS) endif +ifdef UNITDIR_FPMAKE_XFORMS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_XFORMS) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1752,7 +1832,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2057,6 +2137,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/zlib/Makefile b/avr32new/packages/zlib/Makefile index 68a546a094..fe1fefc349 100644 --- a/avr32new/packages/zlib/Makefile +++ b/avr32new/packages/zlib/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=zlib override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=zlib endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=zlib +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=zlib endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=zlib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=zlib +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1202,6 +1243,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1738,6 +1784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1813,6 +1862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1821,6 +1873,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1838,6 +1899,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1950,7 +2014,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2333,6 +2397,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/packages/zorba/Makefile b/avr32new/packages/zorba/Makefile index abf5ed6aff..7c26b8299d 100644 --- a/avr32new/packages/zorba/Makefile +++ b/avr32new/packages/zorba/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=zorba override PACKAGE_VERSION=0.9.9 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=xqc zorba zorbadyn endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=xqc zorba zorbadyn +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=xqc zorba zorbadyn endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=xqc zorba zorbadyn endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=xqc zorba zorbadyn +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=src @@ -564,6 +593,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=src endif @@ -639,6 +671,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -750,6 +785,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -825,6 +863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1173,6 +1214,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1709,6 +1755,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1784,6 +1833,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1792,6 +1844,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1809,6 +1870,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1921,7 +1985,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2298,6 +2362,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/Makefile b/avr32new/rtl/Makefile index 269ed7d340..00391e51ae 100644 --- a/avr32new/rtl/Makefile +++ b/avr32new/rtl/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -359,6 +382,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=embedded endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=wii +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=linux endif @@ -434,6 +460,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=linux endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=embedded +endif override INSTALL_FPCPACKAGE=y override INSTALL_CREATEPACKAGEFPC=y ifdef REQUIRE_UNITSDIR @@ -782,6 +811,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1317,7 +1351,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1611,6 +1645,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -1791,6 +1826,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_DIRS_EMBEDDED=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_WII=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_LINUX=1 endif @@ -1866,6 +1904,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_LINUX=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_EMBEDDED=1 +endif ifdef TARGET_DIRS_LINUX linux_all: $(MAKE) -C linux all @@ -2811,6 +2852,51 @@ morphos: $(MAKE) -C morphos all .PHONY: morphos_all morphos_debug morphos_smart morphos_release morphos_units morphos_examples morphos_shared morphos_install morphos_sourceinstall morphos_exampleinstall morphos_distinstall morphos_zipinstall morphos_zipsourceinstall morphos_zipexampleinstall morphos_zipdistinstall morphos_clean morphos_distclean morphos_cleanall morphos_info morphos_makefiles morphos endif +ifdef TARGET_DIRS_WII +wii_all: + $(MAKE) -C wii all +wii_debug: + $(MAKE) -C wii debug +wii_smart: + $(MAKE) -C wii smart +wii_release: + $(MAKE) -C wii release +wii_units: + $(MAKE) -C wii units +wii_examples: + $(MAKE) -C wii examples +wii_shared: + $(MAKE) -C wii shared +wii_install: + $(MAKE) -C wii install +wii_sourceinstall: + $(MAKE) -C wii sourceinstall +wii_exampleinstall: + $(MAKE) -C wii exampleinstall +wii_distinstall: + $(MAKE) -C wii distinstall +wii_zipinstall: + $(MAKE) -C wii zipinstall +wii_zipsourceinstall: + $(MAKE) -C wii zipsourceinstall +wii_zipexampleinstall: + $(MAKE) -C wii zipexampleinstall +wii_zipdistinstall: + $(MAKE) -C wii zipdistinstall +wii_clean: + $(MAKE) -C wii clean +wii_distclean: + $(MAKE) -C wii distclean +wii_cleanall: + $(MAKE) -C wii cleanall +wii_info: + $(MAKE) -C wii info +wii_makefiles: + $(MAKE) -C wii makefiles +wii: + $(MAKE) -C wii all +.PHONY: wii_all wii_debug wii_smart wii_release wii_units wii_examples wii_shared wii_install wii_sourceinstall wii_exampleinstall wii_distinstall wii_zipinstall wii_zipsourceinstall wii_zipexampleinstall wii_zipdistinstall wii_clean wii_distclean wii_cleanall wii_info wii_makefiles wii +endif ifdef TARGET_DIRS_WIN64 win64_all: $(MAKE) -C win64 all diff --git a/avr32new/rtl/amiga/Makefile b/avr32new/rtl/amiga/Makefile index c604e8733f..65ea4efe42 100644 --- a/avr32new/rtl/amiga/Makefile +++ b/avr32new/rtl/amiga/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc sysutils fgl classes strutils math typinfo varutils fmtbcd charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil objects +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -762,6 +797,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -837,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -1135,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif @@ -1210,6 +1260,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1556,6 +1609,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2091,7 +2149,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2409,6 +2467,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/beos/Makefile b/avr32new/rtl/beos/Makefile index 5cc24e62fa..db75144f70 100644 --- a/avr32new/rtl/beos/Makefile +++ b/avr32new/rtl/beos/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -762,6 +797,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 cprt0 func dllprt +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -837,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 cprt0 func dllprt +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -948,6 +989,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif @@ -1023,6 +1067,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) @@ -1135,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif @@ -1210,6 +1260,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1321,6 +1374,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif @@ -1396,6 +1452,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1507,6 +1566,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_TARGETDIR+=. endif @@ -1582,6 +1644,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_TARGETDIR+=. +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1928,6 +1993,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2463,7 +2533,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2781,6 +2851,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/darwin/Makefile b/avr32new/rtl/darwin/Makefile index 1f4621bf3b..6782412517 100644 --- a/avr32new/rtl/darwin/Makefile +++ b/avr32new/rtl/darwin/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/01] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifeq ($(CPU_TARGET),i386) @@ -408,6 +431,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors ipc terminfo termio video crt mouse keyboard variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd fpintres fpextres clocale objc objcbase endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors ipc terminfo termio video crt mouse keyboard variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd fpintres fpextres clocale objc objcbase +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors ipc terminfo termio video crt mouse keyboard variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd fpintres fpextres clocale objc objcbase endif @@ -483,6 +509,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors ipc terminfo termio video crt mouse keyboard variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd fpintres fpextres clocale objc objcbase endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings sysctl baseunix unixutil unix initc cmem matrix dynlibs $(CPU_UNITS) dos dl objects printer sockets sysutils typinfo fgl classes math varutils types charset ucomplex getopts heaptrc lineinfo lnfodwrf errors ipc terminfo termio video crt mouse keyboard variants dateutils convutils stdconvs sysconst cthreads strutils rtlconsts cwstring bsd fmtbcd fpintres fpextres clocale objc objcbase +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -594,6 +623,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -669,6 +701,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -780,6 +815,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif @@ -855,6 +893,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconsts +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) @@ -967,6 +1008,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -1042,6 +1086,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1153,6 +1200,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1228,6 +1278,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1574,6 +1627,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2109,7 +2167,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2400,6 +2458,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/embedded/Makefile b/avr32new/rtl/embedded/Makefile index 1acdbe2778..99b9168899 100644 --- a/avr32new/rtl/embedded/Makefile +++ b/avr32new/rtl/embedded/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/01/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -282,6 +305,9 @@ SYSINIT_UNITS= ifeq ($(ARCH),arm) CPU_UNITS=lpc21x4 at91sam7x256 stellaris stm32f103 endif +ifeq ($(ARCH),avr32) +CPU_UNITS=at32uc3b1256 +endif ifeq ($(ARCH),i386) CPU_UNITS=multiboot endif @@ -398,6 +424,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) objpas # macpas iso7185 strings endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) objpas # macpas iso7185 strings +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) objpas # macpas iso7185 strings endif @@ -473,6 +502,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) objpas # macpas iso7185 strings endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) objpas # macpas iso7185 strings +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -585,6 +617,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -660,6 +695,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) endif @@ -771,6 +809,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) endif @@ -846,6 +887,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1192,6 +1236,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1727,7 +1776,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2018,6 +2067,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/emx/Makefile b/avr32new/rtl/emx/Makefile index 87a70fd74c..78a841e1c5 100644 --- a/avr32new/rtl/emx/Makefile +++ b/avr32new/rtl/emx/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -394,6 +417,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif @@ -469,6 +495,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes fgl math typinfo varutils winsock fmtbcd charset ucomplex cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil ctypes +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 prt1 endif @@ -766,6 +801,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 prt1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 prt1 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 prt1 endif @@ -841,6 +879,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 prt1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 prt1 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -952,6 +993,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif @@ -1027,6 +1071,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) @@ -1139,6 +1186,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1214,6 +1264,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1325,6 +1378,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif @@ -1400,6 +1456,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1746,6 +1805,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2281,7 +2345,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2599,6 +2663,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/freebsd/Makefile b/avr32new/rtl/freebsd/Makefile index c938da581c..0c8df71b6c 100644 --- a/avr32new/rtl/freebsd/Makefile +++ b/avr32new/rtl/freebsd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/01] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -406,6 +429,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale endif @@ -481,6 +507,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil unix rtlconsts initc cmem matrix dl termio printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd freebsd video mouse keyboard console serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -592,6 +621,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -667,6 +699,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -778,6 +813,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 cprt0 gprt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif @@ -853,6 +891,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 cprt0 gprt0 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -964,6 +1005,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif @@ -1039,6 +1083,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst +endif override INSTALL_FPCPACKAGE=y y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) @@ -1151,6 +1198,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif @@ -1226,6 +1276,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1337,6 +1390,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif @@ -1412,6 +1468,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1758,6 +1817,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2293,7 +2357,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2611,6 +2675,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/gba/Makefile b/avr32new/rtl/gba/Makefile index 4d09b3372f..2a6a4854e4 100644 --- a/avr32new/rtl/gba/Makefile +++ b/avr32new/rtl/gba/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 cprt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 cprt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 cprt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 cprt0 +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -763,6 +798,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -838,6 +876,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1370,6 +1417,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1905,7 +1957,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2223,6 +2275,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/go32v2/Makefile b/avr32new/rtl/go32v2/Makefile index d9c80143b9..4b7c1d139d 100644 --- a/avr32new/rtl/go32v2/Makefile +++ b/avr32new/rtl/go32v2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -394,6 +417,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system objpas macpas iso7185 strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer cmem sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system objpas macpas iso7185 strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer cmem sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system objpas macpas iso7185 strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer cmem sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif @@ -469,6 +495,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system objpas macpas iso7185 strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer cmem sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system objpas macpas iso7185 strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos crt objects printer cmem sysutils classes math typinfo matrix cpu mmx ucomplex getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset varutils video mouse keyboard variants vesamode types fmtbcd sysconst rtlconst dateutil convutil strutils +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -766,6 +801,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 exceptn fpu endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 exceptn fpu +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 exceptn fpu endif @@ -841,6 +879,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 exceptn fpu endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 exceptn fpu +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -952,6 +993,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif @@ -1027,6 +1071,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo classes variants dateutil sysconst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -1139,6 +1186,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1214,6 +1264,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1325,6 +1378,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1400,6 +1456,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1746,6 +1805,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2281,7 +2345,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2599,6 +2663,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/haiku/Makefile b/avr32new/rtl/haiku/Makefile index dcc23095cc..852bef95e8 100644 --- a/avr32new/rtl/haiku/Makefile +++ b/avr32new/rtl/haiku/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -391,6 +414,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring cthreads convutils stdconvs fpintres clocale endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring cthreads convutils stdconvs fpintres clocale +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring cthreads convutils stdconvs fpintres clocale endif @@ -466,6 +492,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring cthreads convutils stdconvs fpintres clocale endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system baseunix unixtype ctypes objpas macpas iso7185 strings errors dos dl objects sysconst sysutils types charset ucomplex typinfo classes fgl math varutils cpu mmx getopts heaptrc lineinfo lnfodwrf variants rtlconsts syscall unix unixutil strutils termio initc cmem crt video mouse keyboard dateutils fmtbcd sockets dynlibs cwstring cthreads convutils stdconvs fpintres clocale +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -577,6 +606,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -652,6 +684,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -763,6 +798,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 cprt0 func dllprt +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif @@ -838,6 +876,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 cprt0 func dllprt endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 cprt0 func dllprt +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs endif @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts dateutils stdconvs +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) @@ -1136,6 +1183,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) endif @@ -1211,6 +1261,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) endif @@ -1322,6 +1375,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) endif @@ -1397,6 +1453,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1508,6 +1567,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_TARGETDIR+=. endif @@ -1583,6 +1645,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_TARGETDIR+=. +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1929,6 +1994,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2464,7 +2534,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2782,6 +2852,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/linux/Makefile b/avr32new/rtl/linux/Makefile index 42e46b5df9..f2b26377d7 100644 --- a/avr32new/rtl/linux/Makefile +++ b/avr32new/rtl/linux/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/01] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -408,6 +431,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas iso7185 syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas iso7185 syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas iso7185 syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif @@ -483,6 +509,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas iso7185 syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) unixtype ctypes baseunix strings objpas macpas iso7185 syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) crt printer linuxvcs sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst fmtbcd cthreads classes fgl convutils stdconvs strutils rtlconsts dos objects cwstring fpcylix clocale +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -594,6 +623,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -669,6 +701,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -780,6 +815,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -855,6 +893,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -966,6 +1007,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif @@ -1041,6 +1085,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants sysconst rtlconsts stdconvs +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=syslinux linux endif @@ -1152,6 +1199,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=syslinux linux endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=syslinux linux +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=syslinux linux endif @@ -1227,6 +1277,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=syslinux linux endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=syslinux linux +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) @@ -1339,6 +1392,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) endif @@ -1414,6 +1470,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) endif @@ -1525,6 +1584,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) endif @@ -1600,6 +1662,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1711,6 +1776,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_TARGETDIR+=. endif @@ -1786,6 +1854,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_TARGETDIR+=. +endif override SHARED_LIBUNITS=$(SYSTEMUNIT) objpas strings dos unix baseunix unixtype unixutil sysutils typinfo math $(CPU_UNITS) getopts errors sockets varutils classes fgl variants sysconst rtlconsts ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -2133,6 +2204,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2668,7 +2744,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2986,6 +3062,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/macos/Makefile b/avr32new/rtl/macos/Makefile index 2abdd17a9d..1ee2bc327c 100644 --- a/avr32new/rtl/macos/Makefile +++ b/avr32new/rtl/macos/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -393,6 +416,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system strings objpas macpas iso7185 heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system strings objpas macpas iso7185 heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system strings objpas macpas iso7185 heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif @@ -468,6 +494,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system strings objpas macpas iso7185 heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system strings objpas macpas iso7185 heaptrc getopts macostp macutils unixutil dos objects matrix cmem charset ctypes +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -766,6 +801,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -841,6 +879,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1187,6 +1228,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1722,7 +1768,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2013,6 +2059,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/morphos/Makefile b/avr32new/rtl/morphos/Makefile index 5472b0a1c7..145247dcbb 100644 --- a/avr32new/rtl/morphos/Makefile +++ b/avr32new/rtl/morphos/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video mouse keyboard sockets clipboard datatypes asl ahi tinygl get9 muihelper endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video mouse keyboard sockets clipboard datatypes asl ahi tinygl get9 muihelper +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video mouse keyboard sockets clipboard datatypes asl ahi tinygl get9 muihelper endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video mouse keyboard sockets clipboard datatypes asl ahi tinygl get9 muihelper endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings dos heaptrc ctypes sysutils classes fgl strutils math typinfo varutils charset ucomplex getopts matrix fmtbcd variants types rtlconsts sysconst dateutil objects exec timer doslib utility hardware inputevent keymap graphics layers intuition aboxlib mui kvm video mouse keyboard sockets clipboard datatypes asl ahi tinygl get9 muihelper +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -762,6 +797,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif @@ -837,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math rtlconsts varutils typinfo variants classes sysconst dateutil +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1135,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1210,6 +1260,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1556,6 +1609,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2091,7 +2149,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2409,6 +2467,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/nativent/Makefile b/avr32new/rtl/nativent/Makefile index cf519d3166..80f3b2ea08 100644 --- a/avr32new/rtl/nativent/Makefile +++ b/avr32new/rtl/nativent/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -399,6 +422,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system objpas iso7185 buildrtl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system objpas iso7185 buildrtl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system objpas iso7185 buildrtl endif @@ -474,6 +500,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system objpas iso7185 buildrtl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system objpas iso7185 buildrtl +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst endif @@ -585,6 +614,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst endif @@ -660,6 +692,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings matrix rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs $(CPU_UNITS) charset ucomplex getopts fmtbcd #rsts=math varutils typinfo variants classes dateutils sysconst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) @@ -772,6 +807,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) endif @@ -847,6 +885,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -958,6 +999,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1033,6 +1077,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1379,6 +1426,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1914,7 +1966,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2205,6 +2257,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/nds/Makefile b/avr32new/rtl/nds/Makefile index 0bc4b03d24..8a60e3ed43 100644 --- a/avr32new/rtl/nds/Makefile +++ b/avr32new/rtl/nds/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/23] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -339,6 +362,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils endif @@ -384,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils endif @@ -459,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -519,6 +554,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -564,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif @@ -639,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt07 prt09 cprt07 cprt09 +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -700,6 +747,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -745,6 +798,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -820,6 +876,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -880,6 +939,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -925,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1000,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1327,7 +1398,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -1342,6 +1413,15 @@ ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent +endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1877,7 +1957,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2195,6 +2275,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/netbsd/Makefile b/avr32new/rtl/netbsd/Makefile index 32c26a7bd4..a6ea84cd2f 100644 --- a/avr32new/rtl/netbsd/Makefile +++ b/avr32new/rtl/netbsd/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -404,6 +427,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst $(CPU_UNITS) fpintres endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst $(CPU_UNITS) fpintres +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst $(CPU_UNITS) fpintres endif @@ -479,6 +505,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst $(CPU_UNITS) fpintres endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes initc dos crt objects printer matrix sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard serial variants types sysctl sysconst $(CPU_UNITS) fpintres +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -590,6 +619,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -665,6 +697,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -776,6 +811,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 cprt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 cprt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 cprt0 endif @@ -851,6 +889,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 cprt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 cprt0 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -962,6 +1003,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif @@ -1037,6 +1081,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit +endif override INSTALL_FPCPACKAGE=y y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) @@ -1149,6 +1196,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1224,6 +1274,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1335,6 +1388,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1410,6 +1466,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1756,6 +1815,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2291,7 +2355,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2609,6 +2673,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/netware/Makefile b/avr32new/rtl/netware/Makefile index 5009c2a214..a5a7acbf14 100644 --- a/avr32new/rtl/netware/Makefile +++ b/avr32new/rtl/netware/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -398,6 +421,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem dynlibs sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem dynlibs sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem dynlibs sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre endif @@ -473,6 +499,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem dynlibs sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard cmem dynlibs sockets aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -584,6 +613,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -659,6 +691,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=nwpre prelude endif @@ -770,6 +805,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=nwpre prelude endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=nwpre prelude +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=nwpre prelude endif @@ -845,6 +883,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=nwpre prelude endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=nwpre prelude +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -956,6 +997,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif @@ -1031,6 +1075,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils variants typinfo classes dateutils sysconst convutils rtlconsts +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -1143,6 +1190,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1218,6 +1268,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1329,6 +1382,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1404,6 +1460,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1750,6 +1809,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2285,7 +2349,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2603,6 +2667,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/netwlibc/Makefile b/avr32new/rtl/netwlibc/Makefile index 6a3f0dbe39..21c48598e5 100644 --- a/avr32new/rtl/netwlibc/Makefile +++ b/avr32new/rtl/netwlibc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -391,6 +414,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard dynlibs cmem sockets ctypes endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard dynlibs cmem sockets ctypes +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard dynlibs cmem sockets ctypes endif @@ -466,6 +492,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard dynlibs cmem sockets ctypes endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings lineinfo lnfodwrf winsock heaptrc matrix nwsnut libc dos crt objects sysconst initc sysutils types typinfo fgl classes fmtbcd cpu mmx getopts dateutils strutils convutils charset ucomplex variants rtlconsts math varutils freebidi utf8bidi mouse video keyboard dynlibs cmem sockets ctypes +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -577,6 +606,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -652,6 +684,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -763,6 +798,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif @@ -838,6 +876,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils variants convutils typinfo classes dateutils sysconst rtlconsts system +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -1136,6 +1183,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1211,6 +1261,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1322,6 +1375,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1397,6 +1453,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1743,6 +1802,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2278,7 +2342,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2596,6 +2660,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/os2/Makefile b/avr32new/rtl/os2/Makefile index 16f8d8ba20..249213b9b6 100644 --- a/avr32new/rtl/os2/Makefile +++ b/avr32new/rtl/os2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -394,6 +417,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif @@ -469,6 +495,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils fgl classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil stdconvs fmtbcd so32dll sockets +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -766,6 +801,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 endif @@ -841,6 +879,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -952,6 +993,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif @@ -1027,6 +1071,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil stdconvs +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -1139,6 +1186,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1214,6 +1264,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1325,6 +1378,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1400,6 +1456,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1746,6 +1805,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2281,7 +2345,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2599,6 +2663,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/palmos/Makefile b/avr32new/rtl/palmos/Makefile index 0c5519bc91..1261b10509 100644 --- a/avr32new/rtl/palmos/Makefile +++ b/avr32new/rtl/palmos/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) ctypes objpas macpas iso7185 strings lnfodwrf lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes fmtbcd strutils convutils math dateutils varutils variants matrix ucomplex charset getopts winsock sockets +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 endif @@ -762,6 +797,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=prt0 +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=prt0 endif @@ -837,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=prt0 endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=prt0 +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos @@ -949,6 +990,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif @@ -1024,6 +1068,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1135,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1210,6 +1260,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1556,6 +1609,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2091,7 +2149,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2409,6 +2467,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/solaris/Makefile b/avr32new/rtl/solaris/Makefile index 40f9276257..3ffeb89114 100644 --- a/avr32new/rtl/solaris/Makefile +++ b/avr32new/rtl/solaris/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/12/17] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -403,6 +426,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas iso7185 macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads convutils stdconvs dos objects cwstring fpintres clocale $(CPU_UNITS) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas iso7185 macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads convutils stdconvs dos objects cwstring fpintres clocale $(CPU_UNITS) +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas iso7185 macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads convutils stdconvs dos objects cwstring fpintres clocale $(CPU_UNITS) endif @@ -478,6 +504,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas iso7185 macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads convutils stdconvs dos objects cwstring fpintres clocale $(CPU_UNITS) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes strings objpas iso7185 macpas heaptrc lineinfo lnfodwrf baseunix unixutil termio unix initc cmem crt printer sysutils typinfo math fgl classes matrix varutils charset ucomplex getopts errors sockets terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst strutils fmtbcd rtlconsts cthreads convutils stdconvs dos objects cwstring fpintres clocale $(CPU_UNITS) +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -589,6 +618,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -664,6 +696,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs endif @@ -775,6 +810,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs endif @@ -850,6 +888,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst stdconvs +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) @@ -962,6 +1003,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif @@ -1037,6 +1081,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -1148,6 +1195,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif @@ -1223,6 +1273,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1569,6 +1622,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2104,7 +2162,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2395,6 +2453,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/symbian/Makefile b/avr32new/rtl/symbian/Makefile index b4cbeafd91..ca9a7e70b3 100644 --- a/avr32new/rtl/symbian/Makefile +++ b/avr32new/rtl/symbian/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -386,6 +409,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl endif @@ -461,6 +487,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -572,6 +601,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=ctypes strings symbian +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif @@ -647,6 +679,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=ctypes strings symbian endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=ctypes strings symbian +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -759,6 +794,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -834,6 +872,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -945,6 +986,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1020,6 +1064,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1366,6 +1413,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1901,7 +1953,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2192,6 +2244,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/wii/Makefile b/avr32new/rtl/wii/Makefile index a056372f94..cf15000727 100644 --- a/avr32new/rtl/wii/Makefile +++ b/avr32new/rtl/wii/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 powerpc-gamecube powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -247,7 +247,7 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) ifeq ($(OS_SOURCE),darwin) DARWIN2DARWIN=1 endif @@ -266,6 +266,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -339,6 +362,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem endif +ifeq ($(FULL_TARGET),i386-nativent) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem endif @@ -384,9 +413,6 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem endif -ifeq ($(FULL_TARGET),powerpc-gamecube) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem -endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings sysutils classes math typinfo varutils fmtbcd ctypes charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil lineinfo fgl varutils cmem +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -526,6 +555,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -571,9 +606,6 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc-gamecube) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -652,6 +684,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -712,6 +747,12 @@ endif ifeq ($(FULL_TARGET),i386-symbian) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -757,9 +798,6 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc-gamecube) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -838,6 +876,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1165,7 +1206,7 @@ DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -1176,19 +1217,13 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif -ifeq ($(OS_TARGET),nds) -EXEEXT=.nds -SHAREDLIBEXT=.so -SHORTSUFFIX=nds -endif ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian endif -ifeq ($(OS_TARGET),gamecube) -EXEEXT=.dol -SHAREDLIBEXT=.so -SHORTSUFFIX=gamecube +ifeq ($(OS_TARGET),NativeNT) +SHAREDLIBEXT=.dll +SHORTSUFFIX=nativent endif ifeq ($(OS_TARGET),wii) EXEEXT=.dol @@ -1730,7 +1765,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2021,6 +2056,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/win32/Makefile b/avr32new/rtl/win32/Makefile index 7317a4e954..ea6a093859 100644 --- a/avr32new/rtl/win32/Makefile +++ b/avr32new/rtl/win32/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/17] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -394,6 +417,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif @@ -469,6 +495,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs endif @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof ctypes strings heaptrc matrix windows winsock winsock2 initc cmem dynlibs signals dos crt objects messages rtlconsts sysconst sysutils math types strutils dateutils varutils variants typinfo fgl classes convutils stdconvs cpu mmx charset ucomplex getopts winevent sockets printer video mouse keyboard fmtbcd winsysut sharemem exeinfo fpintres windirs +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -766,6 +801,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -841,6 +879,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -952,6 +993,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -1027,6 +1071,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) @@ -1139,6 +1186,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif @@ -1214,6 +1264,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1325,6 +1378,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1400,6 +1456,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1746,6 +1805,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2281,7 +2345,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2599,6 +2663,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/win64/Makefile b/avr32new/rtl/win64/Makefile index cca689055d..956004a798 100644 --- a/avr32new/rtl/win64/Makefile +++ b/avr32new/rtl/win64/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/17] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -390,6 +413,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif @@ -465,6 +491,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=system objpas macpas iso7185 buildrtl lineinfo lnfodwrf +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals endif @@ -576,6 +605,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals endif @@ -651,6 +683,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=ctypes strings heaptrc matrix dos crt objects messages windows winsock winsock2 cmem dynlibs rtlconsts sysconst sysutils math types strutils convutils dateutils varutils variants typinfo fgl classes getopts stdconvs sockets printer charset ucomplex fmtbcd winevent video mouse keyboard sharemem exeinfo fpintres windirs cpu signals +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -762,6 +797,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_LOADERS+=$(LOADERS) endif @@ -837,6 +875,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=$(LOADERS) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_LOADERS+=$(LOADERS) +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -948,6 +989,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif @@ -1023,6 +1067,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) @@ -1135,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1210,6 +1260,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1321,6 +1374,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif @@ -1396,6 +1452,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1742,6 +1801,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2277,7 +2341,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2595,6 +2659,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/rtl/wince/Makefile b/avr32new/rtl/wince/Makefile index 9488872241..9e6c5d6e24 100644 --- a/avr32new/rtl/wince/Makefile +++ b/avr32new/rtl/wince/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -265,6 +265,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=rtl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) RTL=.. @@ -394,6 +417,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) fpintres ctypes objpas macpas iso7185 strings lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=$(SYSTEMUNIT) fpintres ctypes objpas macpas iso7185 strings lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) fpintres ctypes objpas macpas iso7185 strings lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif @@ -469,6 +495,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) fpintres ctypes objpas macpas iso7185 strings lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=$(SYSTEMUNIT) fpintres ctypes objpas macpas iso7185 strings lineinfo heaptrc windows messages dynlibs dos objects rtlconsts sysconst sysutils typinfo types fgl classes strutils convutils math dateutils varutils variants fmtbcd matrix ucomplex charset getopts winsock winsock2 sockets cmem sharemem +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -580,6 +609,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_IMPLICITUNITS+=exeinfo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=exeinfo endif @@ -655,6 +687,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=exeinfo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_IMPLICITUNITS+=exeinfo +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win @@ -767,6 +802,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif @@ -842,6 +880,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -953,6 +994,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1028,6 +1072,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1374,6 +1421,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1909,7 +1961,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2200,6 +2252,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/Makefile b/avr32new/utils/Makefile index 3a35fa9a74..a7af4b93aa 100644 --- a/avr32new/utils/Makefile +++ b/avr32new/utils/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=utils override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -455,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg instantfpc fpcres endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg instantfpc +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa endif @@ -644,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir grab_vcsa endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 rmcvsdir +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=rstconv endif @@ -833,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=rstconv endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=rstconv +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=ptopu endif @@ -1022,6 +1054,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=ptopu endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=ptopu +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -2183,6 +2218,12 @@ REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2191,6 +2232,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2208,6 +2258,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2217,6 +2270,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2234,6 +2296,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2243,6 +2308,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -2260,6 +2334,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2269,6 +2346,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -2286,6 +2372,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2295,6 +2384,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2312,6 +2410,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2424,7 +2525,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2809,6 +2910,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3640,6 +3742,17 @@ TARGET_DIRS_FPCMKCFG=1 TARGET_DIRS_INSTANTFPC=1 TARGET_DIRS_FPCRES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +TARGET_DIRS_FPPKG=1 +TARGET_DIRS_FPCM=1 +TARGET_DIRS_TPLY=1 +TARGET_DIRS_H2PAS=1 +TARGET_DIRS_FPRCP=1 +TARGET_DIRS_DXEGEN=1 +TARGET_DIRS_FPDOC=1 +TARGET_DIRS_FPCMKCFG=1 +TARGET_DIRS_INSTANTFPC=1 +endif ifdef TARGET_DIRS_FPPKG fppkg_all: $(MAKE) -C fppkg all diff --git a/avr32new/utils/dxegen/Makefile b/avr32new/utils/dxegen/Makefile index 2b49cc637b..418e60569e 100644 --- a/avr32new/utils/dxegen/Makefile +++ b/avr32new/utils/dxegen/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-go32v2) override TARGET_PROGRAMS+=dxegen endif @@ -378,6 +401,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=coff endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=coff +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=coff endif @@ -453,6 +479,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=coff endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=coff +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -800,6 +829,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1336,6 +1370,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1411,6 +1448,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1419,6 +1459,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1436,6 +1485,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1548,7 +1600,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1847,6 +1899,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fpcm/Makefile b/avr32new/utils/fpcm/Makefile index 98300fb0c1..29e66caf85 100644 --- a/avr32new/utils/fpcm/Makefile +++ b/avr32new/utils/fpcm/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -284,7 +284,6 @@ export FPCFPMAKE export FPMAKE_SKIP_CONFIG endif else -FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif @@ -477,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpcmake endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpcmake +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=fpcmmain endif @@ -666,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=fpcmmain endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=fpcmmain +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif @@ -855,6 +860,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=fpcmmain fpcmdic fpcmwr fpcmpkg +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1890,6 +1898,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2115,7 +2127,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/avr32new/utils/fpcmkcfg/Makefile b/avr32new/utils/fpcmkcfg/Makefile index 60675318b2..9dee085c1e 100644 --- a/avr32new/utils/fpcmkcfg/Makefile +++ b/avr32new/utils/fpcmkcfg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fpcmkcfg endif @@ -453,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpcmkcfg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpcmkcfg +endif override INSTALL_FPCPACKAGE=y override SHARED_BUILD=n override SHARED_BUILD=n @@ -1553,6 +1579,11 @@ REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1561,6 +1592,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1578,6 +1618,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1587,6 +1630,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -1604,6 +1656,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_FCL-PROCESS PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1613,6 +1668,15 @@ UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) @@ -1630,6 +1694,9 @@ endif ifdef UNITDIR_FCL-PROCESS override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1639,6 +1706,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -1656,6 +1732,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1768,7 +1847,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2067,6 +2146,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fpcres/Makefile b/avr32new/utils/fpcres/Makefile index d2652f3dc3..89009f0a9f 100644 --- a/avr32new/utils/fpcres/Makefile +++ b/avr32new/utils/fpcres/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fpcres endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fpcres endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fpcres +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fpcres endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpcres endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpcres +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=closablefilestream msghandler paramparser sourcehandler target +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -983,6 +1018,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1556,6 +1596,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-RES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 @@ -1656,6 +1700,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-RES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1664,6 +1712,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1681,6 +1738,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-RES PACKAGEDIR_FCL-RES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1690,6 +1750,15 @@ UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX) else UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-RES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-RES) $(FPCMADE) @@ -1707,6 +1776,9 @@ endif ifdef UNITDIR_FCL-RES override COMPILER_UNITDIR+=$(UNITDIR_FCL-RES) endif +ifdef UNITDIR_FPMAKE_FCL-RES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-RES) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1819,7 +1891,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2118,6 +2190,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fpcreslipo/Makefile b/avr32new/utils/fpcreslipo/Makefile index c8e28723bf..a5cce81b27 100644 --- a/avr32new/utils/fpcreslipo/Makefile +++ b/avr32new/utils/fpcreslipo/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fpcreslipo endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fpcreslipo endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fpcreslipo +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fpcreslipo endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpcreslipo endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpcreslipo +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=msghandler paramparser sourcehandler endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=msghandler paramparser sourcehandler endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=msghandler paramparser sourcehandler +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=msghandler paramparser sourcehandler endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=msghandler paramparser sourcehandler endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=msghandler paramparser sourcehandler +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -983,6 +1018,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1556,6 +1596,10 @@ ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-RES=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 @@ -1656,6 +1700,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-RES=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-RES=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1664,6 +1712,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1681,6 +1738,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-RES PACKAGEDIR_FCL-RES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-res/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1690,6 +1750,15 @@ UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(TARGETSUFFIX) else UNITDIR_FCL-RES=$(PACKAGEDIR_FCL-RES) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-RES=$(PACKAGEDIR_FCL-RES) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-RES)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-RES) $(FPCMADE) @@ -1707,6 +1776,9 @@ endif ifdef UNITDIR_FCL-RES override COMPILER_UNITDIR+=$(UNITDIR_FCL-RES) endif +ifdef UNITDIR_FPMAKE_FCL-RES +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-RES) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1819,7 +1891,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2118,6 +2190,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fpdoc/Makefile b/avr32new/utils/fpdoc/Makefile index 69cb051718..dbf6b4f00b 100644 --- a/avr32new/utils/fpdoc/Makefile +++ b/avr32new/utils/fpdoc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fpdoc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpdoc makeskel unitdiff fpclasschart +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man dwlinear dw_linrtf +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-S2h +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-S2h endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1388,6 +1435,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2085,6 +2137,13 @@ REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_CHM=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2273,6 +2332,13 @@ REQUIRE_PACKAGES_FCL-XML=1 REQUIRE_PACKAGES_FCL-PASSRC=1 REQUIRE_PACKAGES_CHM=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_CHM=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2281,6 +2347,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2298,6 +2373,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2307,6 +2385,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2324,6 +2411,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2333,6 +2423,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2350,6 +2449,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2359,6 +2461,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2376,6 +2487,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-PASSRC PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2385,6 +2499,15 @@ UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PASSRC) $(FPCMADE) @@ -2402,6 +2525,9 @@ endif ifdef UNITDIR_FCL-PASSRC override COMPILER_UNITDIR+=$(UNITDIR_FCL-PASSRC) endif +ifdef UNITDIR_FPMAKE_FCL-PASSRC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PASSRC) +endif endif ifdef REQUIRE_PACKAGES_CHM PACKAGEDIR_CHM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /chm/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2411,6 +2537,15 @@ UNITDIR_CHM=$(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX) else UNITDIR_CHM=$(PACKAGEDIR_CHM) endif +ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_CHM)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_CHM) $(FPCMADE) @@ -2428,6 +2563,9 @@ endif ifdef UNITDIR_CHM override COMPILER_UNITDIR+=$(UNITDIR_CHM) endif +ifdef UNITDIR_FPMAKE_CHM +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CHM) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2437,6 +2575,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2454,6 +2601,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2566,7 +2716,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2957,6 +3107,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fpmc/Makefile b/avr32new/utils/fpmc/Makefile index 391d889759..e056845137 100644 --- a/avr32new/utils/fpmc/Makefile +++ b/avr32new/utils/fpmc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(OS_TARGET),win32) GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH)))) ifneq ($(GTKDLL),) @@ -383,6 +406,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fpmc endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fpmc +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fpmc fpmcgtk endif @@ -458,6 +484,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fpmc fpmcgtk endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fpmc +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -569,6 +598,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif @@ -644,6 +676,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_RSTS+=frmabout frmmain frmoptions msgcomp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -755,6 +790,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif @@ -830,6 +868,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=frmmain msgcomp frmabout frmoptions +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1208,6 +1249,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1907,6 +1953,13 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_FPGTK=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-BASE=1 @@ -2096,6 +2149,13 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK1=1 REQUIRE_PACKAGES_FPGTK=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK1=1 +REQUIRE_PACKAGES_FPGTK=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2104,6 +2164,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2121,6 +2190,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2130,6 +2202,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2147,6 +2228,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_X11 PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2156,6 +2240,15 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) else UNITDIR_X11=$(PACKAGEDIR_X11) endif +ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_X11)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) @@ -2173,6 +2266,9 @@ endif ifdef UNITDIR_X11 override COMPILER_UNITDIR+=$(UNITDIR_X11) endif +ifdef UNITDIR_FPMAKE_X11 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +endif endif ifdef REQUIRE_PACKAGES_OPENGL PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2182,6 +2278,15 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(TARGETSUFFIX) else UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL) endif +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_OPENGL=$(PACKAGEDIR_OPENGL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_OPENGL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE) @@ -2199,6 +2304,9 @@ endif ifdef UNITDIR_OPENGL override COMPILER_UNITDIR+=$(UNITDIR_OPENGL) endif +ifdef UNITDIR_FPMAKE_OPENGL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_OPENGL) +endif endif ifdef REQUIRE_PACKAGES_GTK1 PACKAGEDIR_GTK1:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk1/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2208,6 +2316,15 @@ UNITDIR_GTK1=$(PACKAGEDIR_GTK1)/units/$(TARGETSUFFIX) else UNITDIR_GTK1=$(PACKAGEDIR_GTK1) endif +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_GTK1=$(PACKAGEDIR_GTK1) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_GTK1)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_GTK1) $(FPCMADE) @@ -2225,6 +2342,9 @@ endif ifdef UNITDIR_GTK1 override COMPILER_UNITDIR+=$(UNITDIR_GTK1) endif +ifdef UNITDIR_FPMAKE_GTK1 +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GTK1) +endif endif ifdef REQUIRE_PACKAGES_FPGTK PACKAGEDIR_FPGTK:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpgtk/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2234,6 +2354,15 @@ UNITDIR_FPGTK=$(PACKAGEDIR_FPGTK)/units/$(TARGETSUFFIX) else UNITDIR_FPGTK=$(PACKAGEDIR_FPGTK) endif +ifneq ($(wildcard $(PACKAGEDIR_FPGTK)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPGTK)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPGTK=$(PACKAGEDIR_FPGTK) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FPGTK)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FPGTK) $(FPCMADE) @@ -2251,6 +2380,9 @@ endif ifdef UNITDIR_FPGTK override COMPILER_UNITDIR+=$(UNITDIR_FPGTK) endif +ifdef UNITDIR_FPMAKE_FPGTK +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPGTK) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2260,6 +2392,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -2277,6 +2418,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2389,7 +2533,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2694,6 +2838,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fppkg/Makefile b/avr32new/utils/fppkg/Makefile index 8f941da254..ae6dabea5f 100644 --- a/avr32new/utils/fppkg/Makefile +++ b/avr32new/utils/fppkg/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=fppkg override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -455,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fppkg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fppkg +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=pkglnet endif @@ -737,6 +763,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=lcommon lcontrolstack levents ltelnet lftp lhttp lhttputil lnet lstrbuffer +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=lnet/sys @@ -927,6 +956,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=lnet/sys endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_INCLUDEDIR+=lnet/sys +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=lnet endif @@ -1116,6 +1148,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_UNITDIR+=lnet endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_UNITDIR+=lnet +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1935,6 +1970,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-go32v2) @@ -1948,6 +1985,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-win32) @@ -1961,6 +2000,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-os2) @@ -1974,6 +2015,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-freebsd) @@ -1988,6 +2031,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-beos) @@ -2002,6 +2047,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-haiku) @@ -2016,6 +2063,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netbsd) @@ -2029,6 +2078,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-solaris) @@ -2042,6 +2093,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-qnx) @@ -2055,6 +2108,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netware) @@ -2068,6 +2123,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-openbsd) @@ -2081,6 +2138,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-wdosx) @@ -2094,6 +2153,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-darwin) @@ -2109,6 +2170,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-emx) @@ -2122,6 +2185,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-watcom) @@ -2135,6 +2200,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) @@ -2148,6 +2215,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-wince) @@ -2161,6 +2230,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-embedded) @@ -2174,6 +2245,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-symbian) @@ -2187,6 +2260,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-nativent) @@ -2200,6 +2275,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) @@ -2215,6 +2292,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-linux) @@ -2229,6 +2308,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) @@ -2243,6 +2324,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) @@ -2256,6 +2339,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-amiga) @@ -2269,6 +2354,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-atari) @@ -2282,6 +2369,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) @@ -2295,6 +2384,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-palmos) @@ -2308,6 +2399,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2321,6 +2414,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-linux) @@ -2335,6 +2430,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) @@ -2348,6 +2445,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) @@ -2361,6 +2460,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-macos) @@ -2374,6 +2475,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -2389,6 +2492,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) @@ -2402,6 +2507,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) @@ -2415,6 +2522,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc-wii) @@ -2428,6 +2537,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-linux) @@ -2442,6 +2553,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) @@ -2455,6 +2568,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-solaris) @@ -2468,6 +2583,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),sparc-embedded) @@ -2481,6 +2598,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-linux) @@ -2495,6 +2614,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) @@ -2509,6 +2630,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) @@ -2522,6 +2645,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) @@ -2537,6 +2662,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-win64) @@ -2550,6 +2677,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) @@ -2563,6 +2692,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-linux) @@ -2577,6 +2708,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-palmos) @@ -2590,6 +2723,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-darwin) @@ -2605,6 +2740,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-wince) @@ -2618,6 +2755,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-gba) @@ -2631,6 +2770,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-nds) @@ -2644,6 +2785,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-embedded) @@ -2657,6 +2800,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),arm-symbian) @@ -2670,6 +2815,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) @@ -2684,6 +2831,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) @@ -2699,6 +2848,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) @@ -2712,6 +2863,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),avr-embedded) @@ -2725,6 +2878,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),armeb-linux) @@ -2739,6 +2894,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),armeb-embedded) @@ -2752,6 +2909,8 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifeq ($(FULL_TARGET),mipsel-linux) @@ -2766,6 +2925,23 @@ REQUIRE_PACKAGES_FCL-NET=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 +REQUIRE_PACKAGES_FPPKG=1 +endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-BASE=1 +REQUIRE_PACKAGES_FCL-XML=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FCL-PASSRC=1 +REQUIRE_PACKAGES_FCL-ASYNC=1 +REQUIRE_PACKAGES_FCL-NET=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_LIBCURL=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_FCL-WEB=1 REQUIRE_PACKAGES_FPPKG=1 endif ifdef REQUIRE_PACKAGES_RTL @@ -2776,6 +2952,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -2793,6 +2978,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-BASE PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2802,6 +2990,15 @@ UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) else UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-BASE)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) @@ -2819,6 +3016,9 @@ endif ifdef UNITDIR_FCL-BASE override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) endif +ifdef UNITDIR_FPMAKE_FCL-BASE +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) +endif endif ifdef REQUIRE_PACKAGES_ICONVENC PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2828,6 +3028,15 @@ UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) else UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) endif +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_ICONVENC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) @@ -2845,6 +3054,9 @@ endif ifdef UNITDIR_ICONVENC override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) endif +ifdef UNITDIR_FPMAKE_ICONVENC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) +endif endif ifdef REQUIRE_PACKAGES_FCL-XML PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2854,6 +3066,15 @@ UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) else UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-XML)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) @@ -2871,6 +3092,9 @@ endif ifdef UNITDIR_FCL-XML override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) endif +ifdef UNITDIR_FPMAKE_FCL-XML +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) +endif endif ifdef REQUIRE_PACKAGES_FCL-PROCESS PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2880,6 +3104,15 @@ UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) @@ -2897,6 +3130,9 @@ endif ifdef UNITDIR_FCL-PROCESS override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif endif ifdef REQUIRE_PACKAGES_FCL-PASSRC PACKAGEDIR_FCL-PASSRC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-passrc/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2906,6 +3142,15 @@ UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PASSRC=$(PACKAGEDIR_FCL-PASSRC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PASSRC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PASSRC) $(FPCMADE) @@ -2923,6 +3168,9 @@ endif ifdef UNITDIR_FCL-PASSRC override COMPILER_UNITDIR+=$(UNITDIR_FCL-PASSRC) endif +ifdef UNITDIR_FPMAKE_FCL-PASSRC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PASSRC) +endif endif ifdef REQUIRE_PACKAGES_FCL-ASYNC PACKAGEDIR_FCL-ASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-async/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2932,6 +3180,15 @@ UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(TARGETSUFFIX) else UNITDIR_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-ASYNC=$(PACKAGEDIR_FCL-ASYNC) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-ASYNC)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-ASYNC) $(FPCMADE) @@ -2949,6 +3206,9 @@ endif ifdef UNITDIR_FCL-ASYNC override COMPILER_UNITDIR+=$(UNITDIR_FCL-ASYNC) endif +ifdef UNITDIR_FPMAKE_FCL-ASYNC +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-ASYNC) +endif endif ifdef REQUIRE_PACKAGES_FCL-NET PACKAGEDIR_FCL-NET:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-net/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2958,6 +3218,15 @@ UNITDIR_FCL-NET=$(PACKAGEDIR_FCL-NET)/units/$(TARGETSUFFIX) else UNITDIR_FCL-NET=$(PACKAGEDIR_FCL-NET) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-NET)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-NET)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-NET=$(PACKAGEDIR_FCL-NET) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-NET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-NET) $(FPCMADE) @@ -2975,6 +3244,9 @@ endif ifdef UNITDIR_FCL-NET override COMPILER_UNITDIR+=$(UNITDIR_FCL-NET) endif +ifdef UNITDIR_FPMAKE_FCL-NET +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-NET) +endif endif ifdef REQUIRE_PACKAGES_HASH PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2984,6 +3256,15 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else UNITDIR_HASH=$(PACKAGEDIR_HASH) endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_HASH)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) @@ -3001,6 +3282,9 @@ endif ifdef UNITDIR_HASH override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif endif ifdef REQUIRE_PACKAGES_PASZLIB PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3010,6 +3294,15 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_PASZLIB)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) @@ -3027,6 +3320,9 @@ endif ifdef UNITDIR_PASZLIB override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif endif ifdef REQUIRE_PACKAGES_LIBCURL PACKAGEDIR_LIBCURL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3036,6 +3332,15 @@ UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(TARGETSUFFIX) else UNITDIR_LIBCURL=$(PACKAGEDIR_LIBCURL) endif +ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_LIBCURL=$(PACKAGEDIR_LIBCURL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_LIBCURL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_LIBCURL) $(FPCMADE) @@ -3053,6 +3358,85 @@ endif ifdef UNITDIR_LIBCURL override COMPILER_UNITDIR+=$(UNITDIR_LIBCURL) endif +ifdef UNITDIR_FPMAKE_LIBCURL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_LIBCURL) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-WEB +PACKAGEDIR_FCL-WEB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-web/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-WEB),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-WEB)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-WEB=$(PACKAGEDIR_FCL-WEB) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-WEB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-WEB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-WEB=$(PACKAGEDIR_FCL-WEB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-WEB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-WEB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-WEB)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-WEB= +UNITDIR_FCL-WEB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-web/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-WEB),) +UNITDIR_FCL-WEB:=$(firstword $(UNITDIR_FCL-WEB)) +else +UNITDIR_FCL-WEB= +endif +endif +ifdef UNITDIR_FCL-WEB +override COMPILER_UNITDIR+=$(UNITDIR_FCL-WEB) +endif +ifdef UNITDIR_FPMAKE_FCL-WEB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-WEB) +endif endif ifdef REQUIRE_PACKAGES_FPPKG PACKAGEDIR_FPPKG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fppkg/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3062,6 +3446,15 @@ UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG)/units/$(TARGETSUFFIX) else UNITDIR_FPPKG=$(PACKAGEDIR_FPPKG) endif +ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPPKG)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPPKG=$(PACKAGEDIR_FPPKG) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FPPKG)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FPPKG) $(FPCMADE) @@ -3079,6 +3472,9 @@ endif ifdef UNITDIR_FPPKG override COMPILER_UNITDIR+=$(UNITDIR_FPPKG) endif +ifdef UNITDIR_FPMAKE_FPPKG +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPPKG) +endif endif ifdef REQUIRE_PACKAGES_UNIVINT PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR)))))) @@ -3088,6 +3484,15 @@ UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(TARGETSUFFIX) else UNITDIR_UNIVINT=$(PACKAGEDIR_UNIVINT) endif +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_UNIVINT=$(PACKAGEDIR_UNIVINT) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_UNIVINT)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_UNIVINT) $(FPCMADE) @@ -3105,6 +3510,9 @@ endif ifdef UNITDIR_UNIVINT override COMPILER_UNITDIR+=$(UNITDIR_UNIVINT) endif +ifdef UNITDIR_FPMAKE_UNIVINT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_UNIVINT) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -3217,7 +3625,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3617,6 +4025,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/fprcp/Makefile b/avr32new/utils/fprcp/Makefile index 20b74e027f..5d8769f9ba 100644 --- a/avr32new/utils/fprcp/Makefile +++ b/avr32new/utils/fprcp/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fprcp endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=fprcp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=fprcp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=fprcp endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fprcp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=fprcp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=comments expr pasprep endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=comments expr pasprep endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=comments expr pasprep +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=comments expr pasprep endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=comments expr pasprep endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=comments expr pasprep +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -983,6 +1018,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1519,6 +1559,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1594,6 +1637,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1602,6 +1648,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1619,6 +1674,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1731,7 +1789,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2030,6 +2088,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/h2pas/Makefile b/avr32new/utils/h2pas/Makefile index c604ca4ebf..bc48d6d7b6 100644 --- a/avr32new/utils/h2pas/Makefile +++ b/avr32new/utils/h2pas/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=h2pas h2paspp endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=h2pas h2paspp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=h2pas h2paspp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=h2pas h2paspp endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=h2pas h2paspp endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=h2pas h2paspp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu endif @@ -561,6 +590,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu endif @@ -636,6 +668,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Sg @@ -748,6 +783,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Sg +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Sg endif @@ -823,6 +861,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Sg +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1169,6 +1210,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1705,6 +1751,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1780,6 +1829,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1788,6 +1840,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1805,6 +1866,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1917,7 +1981,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2216,6 +2280,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/instantfpc/Makefile b/avr32new/utils/instantfpc/Makefile index 7137bdadac..effefb631a 100644 --- a/avr32new/utils/instantfpc/Makefile +++ b/avr32new/utils/instantfpc/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=instantfpc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -455,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=instantfpc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=instantfpc +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=instantfptools endif @@ -644,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=instantfptools endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=instantfptools +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-S2h endif @@ -833,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-S2h endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-S2h +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1861,6 +1893,10 @@ ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_FCL-PROCESS=1 endif +ifeq ($(FULL_TARGET),avr32-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1869,6 +1905,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1886,6 +1931,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifdef REQUIRE_PACKAGES_FCL-PROCESS PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1895,6 +1943,15 @@ UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) else UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) @@ -1912,6 +1969,9 @@ endif ifdef UNITDIR_FCL-PROCESS override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2024,7 +2084,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2409,6 +2469,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/rmwait/Makefile b/avr32new/utils/rmwait/Makefile index 6487eb52bd..050a921245 100644 --- a/avr32new/utils/rmwait/Makefile +++ b/avr32new/utils/rmwait/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/01/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=rmwait endif @@ -375,6 +398,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=rmwait endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=rmwait +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=rmwait endif @@ -450,6 +476,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=rmwait endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=rmwait +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -797,6 +826,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1333,6 +1367,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1408,6 +1445,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1416,6 +1456,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1433,6 +1482,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -1545,7 +1597,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -1844,6 +1896,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) diff --git a/avr32new/utils/tply/Makefile b/avr32new/utils/tply/Makefile index 07e09fec93..f8e615df3f 100644 --- a/avr32new/utils/tply/Makefile +++ b/avr32new/utils/tply/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/25] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux avr32-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +ifndef FPCFPMAKE +ifdef CROSSCOMPILE +ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),) +FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(FPCPROG),) +FPCPROG:=$(firstword $(FPCPROG)) +FPCFPMAKE:=$(shell $(FPCPROG) -PB) +ifeq ($(strip $(wildcard $(FPCFPMAKE))),) +FPCFPMAKE:=$(firstword $(FPCPROG)) +endif +else +override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +else +FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))) +FPMAKE_SKIP_CONFIG=-n +export FPCFPMAKE +export FPMAKE_SKIP_CONFIG +endif +else +FPCFPMAKE=$(FPC) +endif +endif override PACKAGE_NAME=lexyacc override PACKAGE_VERSION=2.5.1 ifeq ($(FULL_TARGET),i386-linux) @@ -377,6 +400,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=plex pyacc endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=plex pyacc +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=plex pyacc endif @@ -452,6 +478,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=plex pyacc endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_PROGRAMS+=plex pyacc +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=lexlib yacclib endif @@ -563,6 +592,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_UNITS+=lexlib yacclib endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_UNITS+=lexlib yacclib +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=lexlib yacclib endif @@ -638,6 +670,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=lexlib yacclib endif +ifeq ($(FULL_TARGET),avr32-embedded) +override TARGET_UNITS+=lexlib yacclib +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -749,6 +784,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif +ifeq ($(FULL_TARGET),powerpc-wii) +override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl +endif ifeq ($(FULL_TARGET),sparc-linux) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif @@ -824,6 +862,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl endif +ifeq ($(FULL_TARGET),avr32-embedded) +override CLEAN_UNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Sg @@ -936,6 +977,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Sg +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_OPTIONS+=-Sg endif @@ -1011,6 +1055,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Sg endif +ifeq ($(FULL_TARGET),avr32-embedded) +override COMPILER_OPTIONS+=-Sg +endif override SHARED_BUILD=n override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR @@ -1359,6 +1406,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1895,6 +1947,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1970,6 +2025,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),avr32-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),) @@ -1978,6 +2036,15 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) else UNITDIR_RTL=$(PACKAGEDIR_RTL) endif +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL) +endif +endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE) @@ -1995,6 +2062,9 @@ endif ifdef UNITDIR_RTL override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif +ifdef UNITDIR_FPMAKE_RTL +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) +endif endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) @@ -2107,7 +2177,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),linux) +ifneq ($(findstring $(OS_TARGET),linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2501,6 +2571,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) |