diff options
Diffstat (limited to 'packages/libndsfpc/examples')
95 files changed, 11141 insertions, 1304 deletions
diff --git a/packages/libndsfpc/examples/Makefile b/packages/libndsfpc/examples/Makefile index d82834a907..c13b8c1c22 100644 --- a/packages/libndsfpc/examples/Makefile +++ b/packages/libndsfpc/examples/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2501,6 +2572,19 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_CARD=1 +TARGET_DIRS_DEBUGGING=1 +TARGET_DIRS_DS_MOTION=1 +TARGET_DIRS_DSWIFI=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GL2D=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_HELLO_WORLD=1 +TARGET_DIRS_INPUT=1 +TARGET_DIRS_TIME=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 @@ -2982,6 +3066,19 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_CARD=1 +TARGET_DIRS_DEBUGGING=1 +TARGET_DIRS_DS_MOTION=1 +TARGET_DIRS_DSWIFI=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GL2D=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_HELLO_WORLD=1 +TARGET_DIRS_INPUT=1 +TARGET_DIRS_TIME=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 @@ -3099,6 +3196,32 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_CARD=1 +TARGET_DIRS_DEBUGGING=1 +TARGET_DIRS_DS_MOTION=1 +TARGET_DIRS_DSWIFI=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GL2D=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_HELLO_WORLD=1 +TARGET_DIRS_INPUT=1 +TARGET_DIRS_TIME=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_CARD=1 +TARGET_DIRS_DEBUGGING=1 +TARGET_DIRS_DS_MOTION=1 +TARGET_DIRS_DSWIFI=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GL2D=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_HELLO_WORLD=1 +TARGET_DIRS_INPUT=1 +TARGET_DIRS_TIME=1 +endif ifdef TARGET_DIRS_AUDIO audio_all: $(MAKE) -C audio all diff --git a/packages/libndsfpc/examples/audio/Makefile b/packages/libndsfpc/examples/audio/Makefile index 15dd1d1bf4..1846694ff1 100644 --- a/packages/libndsfpc/examples/audio/Makefile +++ b/packages/libndsfpc/examples/audio/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=maxmod micrecord endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=maxmod micrecord +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=maxmod micrecord endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=maxmod micrecord endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=maxmod micrecord +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=maxmod micrecord endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=maxmod micrecord endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=maxmod micrecord +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=maxmod micrecord +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2303,6 +2374,10 @@ ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_MAXMOD=1 +TARGET_DIRS_MICRECORD=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 @@ -2451,6 +2526,10 @@ ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_MAXMOD=1 +TARGET_DIRS_MICRECORD=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 @@ -2487,6 +2566,14 @@ ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_MAXMOD=1 +TARGET_DIRS_MICRECORD=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_MAXMOD=1 +TARGET_DIRS_MICRECORD=1 +endif ifdef TARGET_DIRS_MAXMOD maxmod_all: $(MAKE) -C maxmod all diff --git a/packages/libndsfpc/examples/audio/maxmod/Makefile b/packages/libndsfpc/examples/audio/maxmod/Makefile index eeb6703383..1fd3473e35 100644 --- a/packages/libndsfpc/examples/audio/maxmod/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2369,6 +2440,13 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_AUDIO_MODES=1 +TARGET_DIRS_BASIC_SOUND=1 +TARGET_DIRS_REVERB=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2628,6 +2706,13 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_AUDIO_MODES=1 +TARGET_DIRS_BASIC_SOUND=1 +TARGET_DIRS_REVERB=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2691,6 +2776,20 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_AUDIO_MODES=1 +TARGET_DIRS_BASIC_SOUND=1 +TARGET_DIRS_REVERB=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_AUDIO_MODES=1 +TARGET_DIRS_BASIC_SOUND=1 +TARGET_DIRS_REVERB=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 +endif ifdef TARGET_DIRS_AUDIO_MODES audio_modes_all: $(MAKE) -C audio_modes all diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile index 6b02bfbccf..b2f5e79dc2 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=audio_modes endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=audio_modes endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=audio_modes +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -975,6 +1021,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1086,6 +1135,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1113,6 +1165,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1342,6 +1400,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1471,6 +1537,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1889,6 +1969,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2185,6 +2273,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2257,6 +2353,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2597,17 +2709,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile index 65c4fa7b80..0ffc3b4b78 100644 --- a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=basic_sound endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=basic_sound endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=basic_sound +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -975,6 +1021,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1086,6 +1135,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1113,6 +1165,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -O2 @@ -1180,6 +1238,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -O2 endif @@ -1291,6 +1352,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -O2 endif @@ -1318,6 +1382,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1546,6 +1616,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1675,6 +1753,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2093,6 +2185,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2389,6 +2489,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2461,6 +2569,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2801,17 +2925,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile index 6c64297390..04ea7291e3 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=reverb endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=reverb endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=reverb +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -975,6 +1021,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1086,6 +1135,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1113,6 +1165,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1342,6 +1400,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1471,6 +1537,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1889,6 +1969,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2185,6 +2273,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2257,6 +2353,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2597,17 +2709,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile index 5a2d902280..10c1a0eae2 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=song_events_example endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=song_events_example +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=mmsolution.bin endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=mmsolution.bin endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=mmsolution.bin +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -977,6 +1023,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1088,6 +1137,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1115,6 +1167,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -1182,6 +1240,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1293,6 +1354,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1320,6 +1384,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1548,6 +1618,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1677,6 +1755,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2095,6 +2187,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2391,6 +2491,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2463,6 +2571,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2803,17 +2927,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile index c786d3ef15..f429969c27 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example2 endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=song_events_example2 endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=song_events_example2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -975,6 +1021,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1086,6 +1135,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1113,6 +1165,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1342,6 +1400,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1471,6 +1537,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1889,6 +1969,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2185,6 +2273,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2257,6 +2353,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2597,17 +2709,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/audio/micrecord/Makefile b/packages/libndsfpc/examples/audio/micrecord/Makefile index a2bd2b1f29..32d43cad81 100644 --- a/packages/libndsfpc/examples/audio/micrecord/Makefile +++ b/packages/libndsfpc/examples/audio/micrecord/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=micrecord endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=micrecord +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=micrecord endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=micrecord endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=micrecord +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=micrecord endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=micrecord endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=micrecord +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=micrecord +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/card/Makefile b/packages/libndsfpc/examples/card/Makefile index 2731a39e90..237220633d 100644 --- a/packages/libndsfpc/examples/card/Makefile +++ b/packages/libndsfpc/examples/card/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=eeprom endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=eeprom +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=eeprom endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=eeprom endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=eeprom +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=eeprom endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=eeprom endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=eeprom +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=eeprom +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2281,6 +2352,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_EEPROM=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_EEPROM=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_EEPROM=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_EEPROM=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_EEPROM=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_EEPROM=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_EEPROM=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_EEPROM=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_EEPROM=1 +endif ifdef TARGET_DIRS_EEPROM eeprom_all: $(MAKE) -C eeprom all diff --git a/packages/libndsfpc/examples/card/eeprom/Makefile b/packages/libndsfpc/examples/card/eeprom/Makefile index 0bd76d8a8f..12da310a2c 100644 --- a/packages/libndsfpc/examples/card/eeprom/Makefile +++ b/packages/libndsfpc/examples/card/eeprom/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=eeprom endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=eeprom +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=eeprom endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=eeprom endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=eeprom +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=eeprom endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=eeprom endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=eeprom +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=eeprom +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/debugging/Makefile b/packages/libndsfpc/examples/debugging/Makefile index 7c70800975..2e6d6e65d5 100644 --- a/packages/libndsfpc/examples/debugging/Makefile +++ b/packages/libndsfpc/examples/debugging/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=exceptionTest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=exceptionTest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=exceptionTest endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=exceptionTest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=exceptionTest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=exceptionTest endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=exceptionTest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=exceptionTest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=exceptionTest +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2281,6 +2352,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_EXCEPTIONTEST=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_EXCEPTIONTEST=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_EXCEPTIONTEST=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_EXCEPTIONTEST=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_EXCEPTIONTEST=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_EXCEPTIONTEST=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_EXCEPTIONTEST=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_EXCEPTIONTEST=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_EXCEPTIONTEST=1 +endif ifdef TARGET_DIRS_EXCEPTIONTEST exceptionTest_all: $(MAKE) -C exceptionTest all diff --git a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile index ea8002fa76..643858fcb9 100644 --- a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile +++ b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=exceptionTest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=exceptionTest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=exceptionTest endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=exceptionTest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=exceptionTest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=exceptionTest endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=exceptionTest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=exceptionTest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=exceptionTest +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/ds_motion/Makefile b/packages/libndsfpc/examples/ds_motion/Makefile index 2adb619ab9..b96862d1ca 100644 --- a/packages/libndsfpc/examples/ds_motion/Makefile +++ b/packages/libndsfpc/examples/ds_motion/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=dsMotion endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=dsMotion +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=dsMotion endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=dsMotion endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=dsMotion +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=dsMotion endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=dsMotion endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=dsMotion +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=dsMotion +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/dswifi/Makefile b/packages/libndsfpc/examples/dswifi/Makefile index 6e73e004ab..c91750cc4e 100644 --- a/packages/libndsfpc/examples/dswifi/Makefile +++ b/packages/libndsfpc/examples/dswifi/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=ap_search autoconnect httpget endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=ap_search autoconnect httpget +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=ap_search autoconnect httpget endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=ap_search autoconnect httpget endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=ap_search autoconnect httpget +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=ap_search autoconnect httpget endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=ap_search autoconnect httpget endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=ap_search autoconnect httpget +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=ap_search autoconnect httpget +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2325,6 +2396,11 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_AP_SEARCH=1 +TARGET_DIRS_AUTOCONNECT=1 +TARGET_DIRS_HTTPGET=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 @@ -2510,6 +2586,11 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_AP_SEARCH=1 +TARGET_DIRS_AUTOCONNECT=1 +TARGET_DIRS_HTTPGET=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 @@ -2555,6 +2636,16 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_AP_SEARCH=1 +TARGET_DIRS_AUTOCONNECT=1 +TARGET_DIRS_HTTPGET=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_AP_SEARCH=1 +TARGET_DIRS_AUTOCONNECT=1 +TARGET_DIRS_HTTPGET=1 +endif ifdef TARGET_DIRS_AP_SEARCH ap_search_all: $(MAKE) -C ap_search all diff --git a/packages/libndsfpc/examples/dswifi/ap_search/Makefile b/packages/libndsfpc/examples/dswifi/ap_search/Makefile index efea6b9f4c..7a5428aa05 100644 --- a/packages/libndsfpc/examples/dswifi/ap_search/Makefile +++ b/packages/libndsfpc/examples/dswifi/ap_search/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=apSearch endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=apSearch +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=apSearch endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=apSearch endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=apSearch +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=apSearch endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=apSearch endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=apSearch +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=apSearch +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile index 8c948f8101..bec91e1199 100644 --- a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile +++ b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=autoconnect endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=autoconnect +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=autoconnect endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=autoconnect endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=autoconnect +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=autoconnect endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=autoconnect endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=autoconnect +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=autoconnect +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/dswifi/httpget/Makefile b/packages/libndsfpc/examples/dswifi/httpget/Makefile index 9e9e112062..96264d44fd 100644 --- a/packages/libndsfpc/examples/dswifi/httpget/Makefile +++ b/packages/libndsfpc/examples/dswifi/httpget/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=httpget endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=httpget +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=httpget endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=httpget endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=httpget +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=httpget endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=httpget endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=httpget +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=httpget +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/filesystem/Makefile b/packages/libndsfpc/examples/filesystem/Makefile index ee04190139..1d38eed247 100644 --- a/packages/libndsfpc/examples/filesystem/Makefile +++ b/packages/libndsfpc/examples/filesystem/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=libfat nitrofs endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=libfat nitrofs +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=libfat nitrofs endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=libfat nitrofs endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=libfat nitrofs +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=libfat nitrofs endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=libfat nitrofs endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=libfat nitrofs +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=libfat nitrofs +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2303,6 +2374,10 @@ ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_LIBFAT=1 +TARGET_DIRS_NITROFS=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 @@ -2451,6 +2526,10 @@ ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_LIBFAT=1 +TARGET_DIRS_NITROFS=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 @@ -2487,6 +2566,14 @@ ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_LIBFAT=1 +TARGET_DIRS_NITROFS=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_LIBFAT=1 +TARGET_DIRS_NITROFS=1 +endif ifdef TARGET_DIRS_LIBFAT libfat_all: $(MAKE) -C libfat all diff --git a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile index 24655c8acc..1f4eb632fa 100644 --- a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile +++ b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=embedded_gbfs endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=embedded_gbfs +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=embedded_gbfs endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=embedded_gbfs endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=embedded_gbfs +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=embedded_gbfs endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=embedded_gbfs endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=embedded_gbfs +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=embedded_gbfs +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=data.gbfs endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_LOADERS+=data.gbfs endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_LOADERS+=data.gbfs +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=data.gbfs endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_LOADERS+=data.gbfs endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_LOADERS+=data.gbfs +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_LOADERS+=data.gbfs endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=data.gbfs endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_LOADERS+=data.gbfs +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_LOADERS+=data.gbfs +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -1183,6 +1241,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1294,6 +1355,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1321,6 +1385,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1549,6 +1619,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1678,6 +1756,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2096,6 +2188,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2392,6 +2492,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2464,6 +2572,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2804,17 +2928,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/filesystem/libfat/Makefile b/packages/libndsfpc/examples/filesystem/libfat/Makefile index 0e8b528e8b..f6805ca0d1 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=libfatdir endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=libfatdir +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=libfatdir endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=libfatdir endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=libfatdir +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=libfatdir endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=libfatdir endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=libfatdir +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=libfatdir +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2281,6 +2352,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_LIBFATDIR=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_LIBFATDIR=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LIBFATDIR=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_LIBFATDIR=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_LIBFATDIR=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LIBFATDIR=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_LIBFATDIR=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_LIBFATDIR=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_LIBFATDIR=1 +endif ifdef TARGET_DIRS_LIBFATDIR libfatdir_all: $(MAKE) -C libfatdir all diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile index 459b235e50..8f24370a86 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=access_dir endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=access_dir +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=access_dir endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=access_dir endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=access_dir +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=access_dir endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=access_dir endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=access_dir +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=access_dir +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -979,6 +1025,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1090,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1117,6 +1169,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile index 983821b620..980ee235fb 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=access_file endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=access_file +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=access_file endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=access_file endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=access_file +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=access_file endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=access_file endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=access_file +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=access_file +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -979,6 +1025,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1090,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1117,6 +1169,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile index 80a322a604..b2bff24b2b 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=libfatdir endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=libfatdir +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=libfatdir endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=libfatdir endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=libfatdir +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=libfatdir endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=libfatdir endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=libfatdir +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=libfatdir +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -979,6 +1025,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1090,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1117,6 +1169,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/Makefile index 5cdd7607b9..182ff0f6ba 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=nitrodir endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=nitrodir +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=nitrodir endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=nitrodir endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=nitrodir +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=nitrodir endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=nitrodir endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=nitrodir +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=nitrodir +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2281,6 +2352,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_NITRODIR=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_NITRODIR=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_NITRODIR=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_NITRODIR=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_NITRODIR=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_NITRODIR=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_NITRODIR=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_NITRODIR=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_NITRODIR=1 +endif ifdef TARGET_DIRS_NITRODIR nitrodir_all: $(MAKE) -C nitrodir all diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile index e7b2b97553..a7001fed2b 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -301,208 +311,220 @@ GFX_FILES = $(foreach dir,gfx,$(notdir $(wildcard $(dir)/*.png))) BIN_FILES = $(foreach dir,data,$(notdir $(wildcard $(dir)/*))) NITRO_FILES = $(foreach dir,nitrofiles,$(notdir $(wildcard $(dir)/*))) ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir +endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir +endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),mips-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=* +override TARGET_PROGRAMS+=nitrodir +endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=nitrodir +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=nitrodir endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile index 3d49855843..27ca8b2425 100644 --- a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile +++ b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=2Dplus3D endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=2Dplus3D +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=2Dplus3D endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=2Dplus3D endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=2Dplus3D +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=2Dplus3D endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=2Dplus3D endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=2Dplus3D +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=2Dplus3D +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/Makefile b/packages/libndsfpc/examples/gl2d/Makefile index 62c91802ff..b711771900 100644 --- a/packages/libndsfpc/examples/gl2d/Makefile +++ b/packages/libndsfpc/examples/gl2d/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2391,6 +2462,14 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_2DPLUS3D=1 +TARGET_DIRS_DUAL_SCREEN=1 +TARGET_DIRS_FONTS=1 +TARGET_DIRS_PRIMITIVES=1 +TARGET_DIRS_SCROLLING=1 +TARGET_DIRS_SPRITES=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 @@ -2687,6 +2766,14 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_2DPLUS3D=1 +TARGET_DIRS_DUAL_SCREEN=1 +TARGET_DIRS_FONTS=1 +TARGET_DIRS_PRIMITIVES=1 +TARGET_DIRS_SCROLLING=1 +TARGET_DIRS_SPRITES=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 @@ -2759,6 +2846,22 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_2DPLUS3D=1 +TARGET_DIRS_DUAL_SCREEN=1 +TARGET_DIRS_FONTS=1 +TARGET_DIRS_PRIMITIVES=1 +TARGET_DIRS_SCROLLING=1 +TARGET_DIRS_SPRITES=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_2DPLUS3D=1 +TARGET_DIRS_DUAL_SCREEN=1 +TARGET_DIRS_FONTS=1 +TARGET_DIRS_PRIMITIVES=1 +TARGET_DIRS_SCROLLING=1 +TARGET_DIRS_SPRITES=1 +endif ifdef TARGET_DIRS_2DPLUS3D 2Dplus3D_all: $(MAKE) -C 2Dplus3D all diff --git a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile index bbdc6cacac..483c352703 100644 --- a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile +++ b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=dual_screen endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=dual_screen +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=dual_screen endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=dual_screen endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=dual_screen +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=dual_screen endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=dual_screen endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=dual_screen +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=dual_screen +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/fonts/Makefile b/packages/libndsfpc/examples/gl2d/fonts/Makefile index ea344d496f..ae73bf16d9 100644 --- a/packages/libndsfpc/examples/gl2d/fonts/Makefile +++ b/packages/libndsfpc/examples/gl2d/fonts/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=fonts endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=fonts +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=fonts endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=fonts endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=fonts +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=fonts endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=fonts endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=fonts +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=fonts +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/primitives/Makefile b/packages/libndsfpc/examples/gl2d/primitives/Makefile index 30b3f1d3aa..3c59fd7a54 100644 --- a/packages/libndsfpc/examples/gl2d/primitives/Makefile +++ b/packages/libndsfpc/examples/gl2d/primitives/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=primitives endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=primitives +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=primitives endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=primitives endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=primitives +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=primitives endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=primitives endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=primitives +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=primitives +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/scrolling/Makefile b/packages/libndsfpc/examples/gl2d/scrolling/Makefile index 295c989c13..05c908fdae 100644 --- a/packages/libndsfpc/examples/gl2d/scrolling/Makefile +++ b/packages/libndsfpc/examples/gl2d/scrolling/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=scrolling endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=scrolling +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=scrolling endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=scrolling endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=scrolling +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=scrolling endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=scrolling endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=scrolling +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=scrolling +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/gl2d/sprites/Makefile b/packages/libndsfpc/examples/gl2d/sprites/Makefile index 28d65bc146..58f2995a84 100644 --- a/packages/libndsfpc/examples/gl2d/sprites/Makefile +++ b/packages/libndsfpc/examples/gl2d/sprites/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=sprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=sprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=sprites endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=sprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=sprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=sprites endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=sprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=sprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=sprites +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,210 +952,228 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-gl -Xm -O2 +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm -O2 endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile index 9bf028cf74..ae4beca087 100644 --- a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=3DBothScreens endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=3DBothScreens +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=3DBothScreens endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=3DBothScreens endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=3DBothScreens +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=3DBothScreens endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=3DBothScreens endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=3DBothScreens +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=3DBothScreens +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile index 0ca829b8f8..8f8d47ef21 100644 --- a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=BoxTest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=BoxTest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BoxTest endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=BoxTest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=BoxTest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=BoxTest endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=BoxTest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=BoxTest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=BoxTest +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm #-d__THUMB__ +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile index 0980b905df..5e43097060 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=DisplayList endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=DisplayList +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DisplayList endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=DisplayList endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=DisplayList +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=DisplayList endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=DisplayList endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=DisplayList +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=DisplayList +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile index 1e3ce37fc5..29a540dc39 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=DisplayList2 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=DisplayList2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DisplayList2 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=DisplayList2 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=DisplayList2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=DisplayList2 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=DisplayList2 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=DisplayList2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=DisplayList2 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile index 8014c6c438..b024296b4e 100644 --- a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=EnvMapping endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=EnvMapping +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=EnvMapping endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=EnvMapping endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=EnvMapping +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=EnvMapping endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=EnvMapping endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=EnvMapping +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=EnvMapping +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Makefile index 69bd1972af..28f6b70388 100644 --- a/packages/libndsfpc/examples/graphics/3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2589,6 +2660,23 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_3D_BOTH_SCREENS=1 +TARGET_DIRS_BOXTEST=1 +TARGET_DIRS_DISPLAY_LIST=1 +TARGET_DIRS_DISPLAY_LIST_2=1 +TARGET_DIRS_ENV_MAPPING=1 +TARGET_DIRS_MIXED_TEXT_3D=1 +TARGET_DIRS_ORTHO=1 +TARGET_DIRS_PALETTED_CUBE=1 +TARGET_DIRS_PICKING=1 +TARGET_DIRS_SIMPLE_QUAD=1 +TARGET_DIRS_SIMPLE_TRI=1 +TARGET_DIRS_TEXTURED_CUBE=1 +TARGET_DIRS_TEXTURED_QUAD=1 +TARGET_DIRS_TOON_SHADING=1 +TARGET_DIRS_NEHE=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 @@ -3218,6 +3306,23 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_3D_BOTH_SCREENS=1 +TARGET_DIRS_BOXTEST=1 +TARGET_DIRS_DISPLAY_LIST=1 +TARGET_DIRS_DISPLAY_LIST_2=1 +TARGET_DIRS_ENV_MAPPING=1 +TARGET_DIRS_MIXED_TEXT_3D=1 +TARGET_DIRS_ORTHO=1 +TARGET_DIRS_PALETTED_CUBE=1 +TARGET_DIRS_PICKING=1 +TARGET_DIRS_SIMPLE_QUAD=1 +TARGET_DIRS_SIMPLE_TRI=1 +TARGET_DIRS_TEXTURED_CUBE=1 +TARGET_DIRS_TEXTURED_QUAD=1 +TARGET_DIRS_TOON_SHADING=1 +TARGET_DIRS_NEHE=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 @@ -3371,6 +3476,40 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_3D_BOTH_SCREENS=1 +TARGET_DIRS_BOXTEST=1 +TARGET_DIRS_DISPLAY_LIST=1 +TARGET_DIRS_DISPLAY_LIST_2=1 +TARGET_DIRS_ENV_MAPPING=1 +TARGET_DIRS_MIXED_TEXT_3D=1 +TARGET_DIRS_ORTHO=1 +TARGET_DIRS_PALETTED_CUBE=1 +TARGET_DIRS_PICKING=1 +TARGET_DIRS_SIMPLE_QUAD=1 +TARGET_DIRS_SIMPLE_TRI=1 +TARGET_DIRS_TEXTURED_CUBE=1 +TARGET_DIRS_TEXTURED_QUAD=1 +TARGET_DIRS_TOON_SHADING=1 +TARGET_DIRS_NEHE=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_3D_BOTH_SCREENS=1 +TARGET_DIRS_BOXTEST=1 +TARGET_DIRS_DISPLAY_LIST=1 +TARGET_DIRS_DISPLAY_LIST_2=1 +TARGET_DIRS_ENV_MAPPING=1 +TARGET_DIRS_MIXED_TEXT_3D=1 +TARGET_DIRS_ORTHO=1 +TARGET_DIRS_PALETTED_CUBE=1 +TARGET_DIRS_PICKING=1 +TARGET_DIRS_SIMPLE_QUAD=1 +TARGET_DIRS_SIMPLE_TRI=1 +TARGET_DIRS_TEXTURED_CUBE=1 +TARGET_DIRS_TEXTURED_QUAD=1 +TARGET_DIRS_TOON_SHADING=1 +TARGET_DIRS_NEHE=1 +endif ifdef TARGET_DIRS_3D_BOTH_SCREENS 3D_Both_Screens_all: $(MAKE) -C 3D_Both_Screens all diff --git a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile index 01778d58c6..5fa296feb9 100644 --- a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=MixedText3D endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=MixedText3D +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=MixedText3D endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=MixedText3D endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=MixedText3D +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=MixedText3D endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=MixedText3D endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=MixedText3D +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=MixedText3D +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile index 9ed78b529a..81751f98d2 100644 --- a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=Ortho endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=Ortho +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Ortho endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=Ortho endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=Ortho +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=Ortho endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=Ortho endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=Ortho +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=Ortho +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile index b67b444074..4421544604 100644 --- a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=PalettedCube endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=PalettedCube +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=PalettedCube endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=PalettedCube endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=PalettedCube +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=PalettedCube endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=PalettedCube endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=PalettedCube +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=PalettedCube +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile index 32025c10f9..f90fd4532d 100644 --- a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=Picking endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=Picking +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Picking endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=Picking endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=Picking +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=Picking endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=Picking endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=Picking +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=Picking +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile index 48ab234279..3108daefc5 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=SimpleQuad endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=SimpleQuad +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SimpleQuad endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=SimpleQuad endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=SimpleQuad +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=SimpleQuad endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=SimpleQuad endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=SimpleQuad +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=SimpleQuad +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile index 64372c39bf..2df61b0b74 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=SimpleTri endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=SimpleTri +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SimpleTri endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=SimpleTri endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=SimpleTri +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=SimpleTri endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=SimpleTri endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=SimpleTri +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=SimpleTri +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile index 1d565a5859..769b1e5716 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=TexturedCube endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=TexturedCube +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=TexturedCube endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=TexturedCube endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=TexturedCube +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=TexturedCube endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=TexturedCube endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=TexturedCube +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=TexturedCube +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile index 2b4bc4467b..23ff807a98 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=TexturedQuad endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=TexturedQuad +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=TexturedQuad endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=TexturedQuad endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=TexturedQuad +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=TexturedQuad endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=TexturedQuad endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=TexturedQuad +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=TexturedQuad +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile index 4ff9ce26c7..7042b623ae 100644 --- a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=ToonShading endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=ToonShading +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=ToonShading endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=ToonShading endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=ToonShading +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=ToonShading endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=ToonShading endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=ToonShading +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=ToonShading +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile index 7baef70b4f..fd3670cce0 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2523,6 +2594,20 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_LESSON01=1 +TARGET_DIRS_LESSON02=1 +TARGET_DIRS_LESSON03=1 +TARGET_DIRS_LESSON04=1 +TARGET_DIRS_LESSON05=1 +TARGET_DIRS_LESSON06=1 +TARGET_DIRS_LESSON07=1 +TARGET_DIRS_LESSON08=1 +TARGET_DIRS_LESSON09=1 +TARGET_DIRS_LESSON10=1 +TARGET_DIRS_LESSON10B=1 +TARGET_DIRS_LESSON11=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3041,6 +3126,20 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_LESSON01=1 +TARGET_DIRS_LESSON02=1 +TARGET_DIRS_LESSON03=1 +TARGET_DIRS_LESSON04=1 +TARGET_DIRS_LESSON05=1 +TARGET_DIRS_LESSON06=1 +TARGET_DIRS_LESSON07=1 +TARGET_DIRS_LESSON08=1 +TARGET_DIRS_LESSON09=1 +TARGET_DIRS_LESSON10=1 +TARGET_DIRS_LESSON10B=1 +TARGET_DIRS_LESSON11=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3167,6 +3266,34 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_LESSON01=1 +TARGET_DIRS_LESSON02=1 +TARGET_DIRS_LESSON03=1 +TARGET_DIRS_LESSON04=1 +TARGET_DIRS_LESSON05=1 +TARGET_DIRS_LESSON06=1 +TARGET_DIRS_LESSON07=1 +TARGET_DIRS_LESSON08=1 +TARGET_DIRS_LESSON09=1 +TARGET_DIRS_LESSON10=1 +TARGET_DIRS_LESSON10B=1 +TARGET_DIRS_LESSON11=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_LESSON01=1 +TARGET_DIRS_LESSON02=1 +TARGET_DIRS_LESSON03=1 +TARGET_DIRS_LESSON04=1 +TARGET_DIRS_LESSON05=1 +TARGET_DIRS_LESSON06=1 +TARGET_DIRS_LESSON07=1 +TARGET_DIRS_LESSON08=1 +TARGET_DIRS_LESSON09=1 +TARGET_DIRS_LESSON10=1 +TARGET_DIRS_LESSON10B=1 +TARGET_DIRS_LESSON11=1 +endif ifdef TARGET_DIRS_LESSON01 lesson01_all: $(MAKE) -C lesson01 all diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile index 373cd5fd38..bd5327d60e 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson01 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson01 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson01 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson01 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson01 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson01 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson01 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson01 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson01 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile index 4546f1ec97..319b56bbbd 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson02 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson02 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson02 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson02 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson02 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson02 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson02 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson02 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson02 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile index 17253d6407..9213ee928d 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson03 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson03 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson03 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson03 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson03 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson03 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson03 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson03 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson03 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile index 98a4bd61d2..e9ecdccce5 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson04 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson04 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson04 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson04 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson04 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson04 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson04 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson04 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson04 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile index 1fdefbea94..1d207737b2 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson05 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson05 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson05 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson05 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson05 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson05 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson05 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson05 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson05 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile index fd726d0b20..82b77ebc34 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson06 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson06 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson06 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson06 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson06 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson06 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson06 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson06 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson06 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile index 7e97f11fa3..34b1f3049d 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson07 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson07 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson07 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson07 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson07 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson07 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson07 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson07 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson07 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile index 0beb3d5cdc..bc5856322f 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson08 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson08 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson08 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson08 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson08 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson08 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson08 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson08 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson08 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile index be651aa13b..1e93818000 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson09 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson09 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson09 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson09 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson09 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson09 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson09 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson09 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson09 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile index 2cb222aad2..03b190e8fe 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson10 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson10 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson10 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson10 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson10 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson10 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson10 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson10 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson10 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile index 24315c6987..ed49b18cbb 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson10b endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson10b +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson10b endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson10b endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson10b +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson10b endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson10b endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson10b +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson10b +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile index 10bd666805..3e2c0b94c6 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=lesson11 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson11 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson11 endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson11 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson11 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson11 endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson11 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson11 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson11 +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile index 7363907fae..bce2773be5 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=16bitColorBmp endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=16bitColorBmp +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=16bitColorBmp endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=16bitColorBmp endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=16bitColorBmp +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=16bitColorBmp endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=16bitColorBmp endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=16bitColorBmp +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=16bitColorBmp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile index d00a1fe2c1..0bb490a6c6 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=256ColorBmp endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=256ColorBmp +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=256ColorBmp endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=256ColorBmp endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=256ColorBmp +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=256ColorBmp endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=256ColorBmp endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=256ColorBmp +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=256ColorBmp +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile index 7031ff5597..9071578c53 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=DoubleBuffer endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=DoubleBuffer +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DoubleBuffer endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=DoubleBuffer endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=DoubleBuffer +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=DoubleBuffer endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=DoubleBuffer endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=DoubleBuffer +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=DoubleBuffer +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Makefile index f1583c2901..738b31e147 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2369,6 +2440,13 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_16BIT_COLOR_BMP=1 +TARGET_DIRS_256_COLOR_BMP=1 +TARGET_DIRS_ALL_IN_ONE=1 +TARGET_DIRS_DOUBLE_BUFFER=1 +TARGET_DIRS_ROTATION=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 @@ -2628,6 +2706,13 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_16BIT_COLOR_BMP=1 +TARGET_DIRS_256_COLOR_BMP=1 +TARGET_DIRS_ALL_IN_ONE=1 +TARGET_DIRS_DOUBLE_BUFFER=1 +TARGET_DIRS_ROTATION=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 @@ -2691,6 +2776,20 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_16BIT_COLOR_BMP=1 +TARGET_DIRS_256_COLOR_BMP=1 +TARGET_DIRS_ALL_IN_ONE=1 +TARGET_DIRS_DOUBLE_BUFFER=1 +TARGET_DIRS_ROTATION=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_16BIT_COLOR_BMP=1 +TARGET_DIRS_256_COLOR_BMP=1 +TARGET_DIRS_ALL_IN_ONE=1 +TARGET_DIRS_DOUBLE_BUFFER=1 +TARGET_DIRS_ROTATION=1 +endif ifdef TARGET_DIRS_16BIT_COLOR_BMP 16bit_color_bmp_all: $(MAKE) -C 16bit_color_bmp all diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile index 7cabdf4c13..6c5446fda9 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=BackgroundAllInOne endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=BackgroundAllInOne +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BackgroundAllInOne endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=BackgroundAllInOne endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=BackgroundAllInOne +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=BackgroundAllInOne endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=BackgroundAllInOne endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=BackgroundAllInOne +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=BackgroundAllInOne +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -570,6 +592,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -681,6 +706,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -708,6 +736,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -979,6 +1025,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1090,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1117,6 +1169,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1345,6 +1403,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1474,6 +1540,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1892,6 +1972,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2188,6 +2276,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2260,6 +2356,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2600,17 +2712,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile index 93778f9cf5..9696ac3b34 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=Rotation endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=Rotation +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Rotation endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=Rotation endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=Rotation +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=Rotation endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=Rotation endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=Rotation +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=Rotation +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Makefile b/packages/libndsfpc/examples/graphics/Makefile index d0984fd20f..058c13e2c8 100644 --- a/packages/libndsfpc/examples/graphics/Makefile +++ b/packages/libndsfpc/examples/graphics/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=3D Backgrounds Printing Sprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=3D Backgrounds Printing Sprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=3D Backgrounds Printing Sprites endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=3D Backgrounds Printing Sprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=3D Backgrounds Printing Sprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=3D Backgrounds Printing Sprites endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=3D Backgrounds Printing Sprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=3D Backgrounds Printing Sprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=3D Backgrounds Printing Sprites +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2347,6 +2418,12 @@ TARGET_DIRS_BACKGROUNDS=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_3D=1 +TARGET_DIRS_BACKGROUNDS=1 +TARGET_DIRS_PRINTING=1 +TARGET_DIRS_SPRITES=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 @@ -2569,6 +2646,12 @@ TARGET_DIRS_BACKGROUNDS=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_3D=1 +TARGET_DIRS_BACKGROUNDS=1 +TARGET_DIRS_PRINTING=1 +TARGET_DIRS_SPRITES=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 @@ -2623,6 +2706,18 @@ TARGET_DIRS_BACKGROUNDS=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_3D=1 +TARGET_DIRS_BACKGROUNDS=1 +TARGET_DIRS_PRINTING=1 +TARGET_DIRS_SPRITES=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_3D=1 +TARGET_DIRS_BACKGROUNDS=1 +TARGET_DIRS_PRINTING=1 +TARGET_DIRS_SPRITES=1 +endif ifdef TARGET_DIRS_3D 3D_all: $(MAKE) -C 3D all diff --git a/packages/libndsfpc/examples/graphics/Printing/Makefile b/packages/libndsfpc/examples/graphics/Printing/Makefile index 19fda9fdf3..513e19c93a 100644 --- a/packages/libndsfpc/examples/graphics/Printing/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2369,6 +2440,13 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_ANSI_CONSOLE=1 +TARGET_DIRS_CONSOLE_WINDOWS=1 +TARGET_DIRS_CUSTOM_FONT=1 +TARGET_DIRS_PRINT_BOTH_SCREENS=1 +TARGET_DIRS_ROTSCALE_TEXT=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 @@ -2628,6 +2706,13 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_ANSI_CONSOLE=1 +TARGET_DIRS_CONSOLE_WINDOWS=1 +TARGET_DIRS_CUSTOM_FONT=1 +TARGET_DIRS_PRINT_BOTH_SCREENS=1 +TARGET_DIRS_ROTSCALE_TEXT=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 @@ -2691,6 +2776,20 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_ANSI_CONSOLE=1 +TARGET_DIRS_CONSOLE_WINDOWS=1 +TARGET_DIRS_CUSTOM_FONT=1 +TARGET_DIRS_PRINT_BOTH_SCREENS=1 +TARGET_DIRS_ROTSCALE_TEXT=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_ANSI_CONSOLE=1 +TARGET_DIRS_CONSOLE_WINDOWS=1 +TARGET_DIRS_CUSTOM_FONT=1 +TARGET_DIRS_PRINT_BOTH_SCREENS=1 +TARGET_DIRS_ROTSCALE_TEXT=1 +endif ifdef TARGET_DIRS_ANSI_CONSOLE ansi_console_all: $(MAKE) -C ansi_console all diff --git a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile index f01fdb66a3..ed6e6d5803 100644 --- a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=AnsiConsole endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=AnsiConsole +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AnsiConsole endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=AnsiConsole endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=AnsiConsole +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=AnsiConsole endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=AnsiConsole endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=AnsiConsole +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=AnsiConsole +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile index 70382e3fbc..0ab779e5e2 100644 --- a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=ConsoleWindows endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=ConsoleWindows +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=ConsoleWindows endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=ConsoleWindows endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=ConsoleWindows +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=ConsoleWindows endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=ConsoleWindows endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=ConsoleWindows +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=ConsoleWindows +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile index a53ead2386..c1418e4d42 100644 --- a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=CustomFont endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=CustomFont +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=CustomFont endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=CustomFont endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=CustomFont +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=CustomFont endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=CustomFont endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=CustomFont +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=CustomFont +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile index 093f3e0ded..41ae693dd2 100644 --- a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=printBothScreens endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=printBothScreens +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=printBothScreens endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=printBothScreens endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=printBothScreens +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=printBothScreens endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=printBothScreens endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=printBothScreens +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=printBothScreens +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile index 2b656ea411..afb4c76b18 100644 --- a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=RotscaleText endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=RotscaleText +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=RotscaleText endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=RotscaleText endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=RotscaleText +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=RotscaleText endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=RotscaleText endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=RotscaleText +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=RotscaleText +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/Makefile index 0eac0dadcf..335bad9367 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2413,6 +2484,15 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_ALLOCATION_TEST=1 +TARGET_DIRS_ANIMATE_SIMPLE=1 +TARGET_DIRS_BITMAP_SPRITES=1 +TARGET_DIRS_FIRE_AND_SPRITES=1 +TARGET_DIRS_SIMPLE=1 +TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 +TARGET_DIRS_SPRITE_ROTATE=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 @@ -2746,6 +2826,15 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_ALLOCATION_TEST=1 +TARGET_DIRS_ANIMATE_SIMPLE=1 +TARGET_DIRS_BITMAP_SPRITES=1 +TARGET_DIRS_FIRE_AND_SPRITES=1 +TARGET_DIRS_SIMPLE=1 +TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 +TARGET_DIRS_SPRITE_ROTATE=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 @@ -2827,6 +2916,24 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_ALLOCATION_TEST=1 +TARGET_DIRS_ANIMATE_SIMPLE=1 +TARGET_DIRS_BITMAP_SPRITES=1 +TARGET_DIRS_FIRE_AND_SPRITES=1 +TARGET_DIRS_SIMPLE=1 +TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 +TARGET_DIRS_SPRITE_ROTATE=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_ALLOCATION_TEST=1 +TARGET_DIRS_ANIMATE_SIMPLE=1 +TARGET_DIRS_BITMAP_SPRITES=1 +TARGET_DIRS_FIRE_AND_SPRITES=1 +TARGET_DIRS_SIMPLE=1 +TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 +TARGET_DIRS_SPRITE_ROTATE=1 +endif ifdef TARGET_DIRS_ALLOCATION_TEST allocation_test_all: $(MAKE) -C allocation_test all diff --git a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile index db50a3ff3d..0ef5cfc83a 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=AllocationTest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=AllocationTest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AllocationTest endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=AllocationTest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=AllocationTest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=AllocationTest endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=AllocationTest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=AllocationTest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=AllocationTest +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile index 852fba14da..956f7e59a3 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=AnimateSimple endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=AnimateSimple +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AnimateSimple endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=AnimateSimple endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=AnimateSimple +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=AnimateSimple endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=AnimateSimple endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=AnimateSimple +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=AnimateSimple +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile index f02447ceac..fcef842fa9 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=BitmapSprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=BitmapSprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BitmapSprites endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=BitmapSprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=BitmapSprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=BitmapSprites endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=BitmapSprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=BitmapSprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=BitmapSprites +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile index 679126cff8..fc8e51f2b0 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=FireAndSprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=FireAndSprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=FireAndSprites endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=FireAndSprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=FireAndSprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=FireAndSprites endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=FireAndSprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=FireAndSprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=FireAndSprites +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -O2 @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -O2 endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -O2 +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile index e51943795c..0f0cfb81b7 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=Simple endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=Simple +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Simple endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=Simple endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=Simple +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=Simple endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=Simple endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=Simple +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=Simple +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile index 619411e72c..28d60efc09 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=SpriteExtendedPalettes +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=SpriteExtendedPalettes +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=SpriteExtendedPalettes +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=SpriteExtendedPalettes +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile index ba9ba43f64..63dc49be5f 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=SpriteRotate endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=SpriteRotate +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SpriteRotate endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=SpriteRotate endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=SpriteRotate +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=SpriteRotate endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=SpriteRotate endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=SpriteRotate +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=SpriteRotate +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/hello_world/Makefile b/packages/libndsfpc/examples/hello_world/Makefile index ca7d324e09..3fca8cbe00 100644 --- a/packages/libndsfpc/examples/hello_world/Makefile +++ b/packages/libndsfpc/examples/hello_world/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=helloWorld endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=helloWorld +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=helloWorld endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=helloWorld endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=helloWorld +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=helloWorld endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=helloWorld endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=helloWorld +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=helloWorld +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/input/Makefile b/packages/libndsfpc/examples/input/Makefile index c9061c6dc7..0f4f1334f0 100644 --- a/packages/libndsfpc/examples/input/Makefile +++ b/packages/libndsfpc/examples/input/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=keyboard Touch_Pad endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=keyboard Touch_Pad +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=keyboard Touch_Pad endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=keyboard Touch_Pad endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=keyboard Touch_Pad +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=keyboard Touch_Pad endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=keyboard Touch_Pad endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=keyboard Touch_Pad +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=keyboard Touch_Pad +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2303,6 +2374,10 @@ ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_KEYBOARD=1 +TARGET_DIRS_TOUCH_PAD=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 @@ -2451,6 +2526,10 @@ ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_KEYBOARD=1 +TARGET_DIRS_TOUCH_PAD=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 @@ -2487,6 +2566,14 @@ ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_KEYBOARD=1 +TARGET_DIRS_TOUCH_PAD=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_KEYBOARD=1 +TARGET_DIRS_TOUCH_PAD=1 +endif ifdef TARGET_DIRS_KEYBOARD keyboard_all: $(MAKE) -C keyboard all diff --git a/packages/libndsfpc/examples/input/Touch_Pad/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/Makefile index a89c1456f5..9348d883cd 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=touch_area touch_look touch_test endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=touch_area touch_look touch_test +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=touch_area touch_look touch_test endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=touch_area touch_look touch_test endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=touch_area touch_look touch_test +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=touch_area touch_look touch_test endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=touch_area touch_look touch_test endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=touch_area touch_look touch_test +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=touch_area touch_look touch_test +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2325,6 +2396,11 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_TOUCH_AREA=1 +TARGET_DIRS_TOUCH_LOOK=1 +TARGET_DIRS_TOUCH_TEST=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 @@ -2510,6 +2586,11 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_TOUCH_AREA=1 +TARGET_DIRS_TOUCH_LOOK=1 +TARGET_DIRS_TOUCH_TEST=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 @@ -2555,6 +2636,16 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_TOUCH_AREA=1 +TARGET_DIRS_TOUCH_LOOK=1 +TARGET_DIRS_TOUCH_TEST=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_TOUCH_AREA=1 +TARGET_DIRS_TOUCH_LOOK=1 +TARGET_DIRS_TOUCH_TEST=1 +endif ifdef TARGET_DIRS_TOUCH_AREA touch_area_all: $(MAKE) -C touch_area all diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile index 7faecc03b4..6226d8d055 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=touchArea endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=touchArea +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchArea endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=touchArea endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=touchArea +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=touchArea endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=touchArea endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=touchArea +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=touchArea +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile index 5d639e873d..4f4aefc287 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=touchLook endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=touchLook +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchLook endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=touchLook endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=touchLook +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=touchLook endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=touchLook endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=touchLook +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=touchLook +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile index 4fb07cddf7..5865d22f9f 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -365,6 +375,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=touchTest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=touchTest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchTest endif @@ -476,6 +489,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=touchTest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=touchTest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=touchTest endif @@ -503,6 +519,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=touchTest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=touchTest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=touchTest +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -569,6 +591,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -680,6 +705,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -707,6 +735,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif @@ -773,6 +807,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif @@ -884,6 +921,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif @@ -911,6 +951,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ @@ -978,6 +1024,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ endif @@ -1089,6 +1138,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ endif @@ -1116,6 +1168,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -d__THUMB__ +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1344,6 +1402,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1473,6 +1539,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1891,6 +1971,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2187,6 +2275,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2259,6 +2355,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2599,17 +2711,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/input/keyboard/Makefile b/packages/libndsfpc/examples/input/keyboard/Makefile index ced8b24c4c..b631cf6369 100644 --- a/packages/libndsfpc/examples/input/keyboard/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=keyboard_async keyboard_stdin endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=keyboard_async keyboard_stdin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=keyboard_async keyboard_stdin endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=keyboard_async keyboard_stdin endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=keyboard_async keyboard_stdin +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=keyboard_async keyboard_stdin endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=keyboard_async keyboard_stdin endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=keyboard_async keyboard_stdin +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=keyboard_async keyboard_stdin +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2303,6 +2374,10 @@ ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_KEYBOARD_ASYNC=1 +TARGET_DIRS_KEYBOARD_STDIN=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 @@ -2451,6 +2526,10 @@ ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_KEYBOARD_ASYNC=1 +TARGET_DIRS_KEYBOARD_STDIN=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 @@ -2487,6 +2566,14 @@ ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_KEYBOARD_ASYNC=1 +TARGET_DIRS_KEYBOARD_STDIN=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_KEYBOARD_ASYNC=1 +TARGET_DIRS_KEYBOARD_STDIN=1 +endif ifdef TARGET_DIRS_KEYBOARD_ASYNC keyboard_async_all: $(MAKE) -C keyboard_async all diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile index 2e61649574..e565139019 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=keyboardAsync endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=keyboardAsync +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=keyboardAsync endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=keyboardAsync endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=keyboardAsync +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=keyboardAsync endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=keyboardAsync endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=keyboardAsync +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=keyboardAsync +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile index 2281c9e3f2..e6e4245b75 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=keyboardStdin endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=keyboardStdin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=keyboardStdin endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=keyboardStdin endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=keyboardStdin +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=keyboardStdin endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=keyboardStdin endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=keyboardStdin +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=keyboardStdin +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/time/Makefile b/packages/libndsfpc/examples/time/Makefile index f1f37aadd4..40c55cefea 100644 --- a/packages/libndsfpc/examples/time/Makefile +++ b/packages/libndsfpc/examples/time/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=RealTimeClock timercallback stopwatch +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=RealTimeClock timercallback stopwatch +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=RealTimeClock timercallback stopwatch +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=RealTimeClock timercallback stopwatch +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -725,6 +747,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -854,6 +884,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1272,6 +1316,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1568,6 +1620,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1640,6 +1700,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1980,17 +2056,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2325,6 +2396,11 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_REALTIMECLOCK=1 +TARGET_DIRS_TIMERCALLBACK=1 +TARGET_DIRS_STOPWATCH=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 @@ -2510,6 +2586,11 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_REALTIMECLOCK=1 +TARGET_DIRS_TIMERCALLBACK=1 +TARGET_DIRS_STOPWATCH=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 @@ -2555,6 +2636,16 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_REALTIMECLOCK=1 +TARGET_DIRS_TIMERCALLBACK=1 +TARGET_DIRS_STOPWATCH=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_REALTIMECLOCK=1 +TARGET_DIRS_TIMERCALLBACK=1 +TARGET_DIRS_STOPWATCH=1 +endif ifdef TARGET_DIRS_REALTIMECLOCK RealTimeClock_all: $(MAKE) -C RealTimeClock all diff --git a/packages/libndsfpc/examples/time/RealTimeClock/Makefile b/packages/libndsfpc/examples/time/RealTimeClock/Makefile index 259412fc8a..444eb96fb9 100644 --- a/packages/libndsfpc/examples/time/RealTimeClock/Makefile +++ b/packages/libndsfpc/examples/time/RealTimeClock/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=RealTimeClock endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=RealTimeClock +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=RealTimeClock endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=RealTimeClock endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=RealTimeClock +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=RealTimeClock endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=RealTimeClock endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=RealTimeClock +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=RealTimeClock +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/time/stopwatch/Makefile b/packages/libndsfpc/examples/time/stopwatch/Makefile index c2d284061d..2604d6f426 100644 --- a/packages/libndsfpc/examples/time/stopwatch/Makefile +++ b/packages/libndsfpc/examples/time/stopwatch/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=stopwatch endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=stopwatch +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=stopwatch endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=stopwatch endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=stopwatch +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=stopwatch endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=stopwatch endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=stopwatch +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=stopwatch +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/libndsfpc/examples/time/timercallback/Makefile b/packages/libndsfpc/examples/time/timercallback/Makefile index c08c0d756e..2e13f2866f 100644 --- a/packages/libndsfpc/examples/time/timercallback/Makefile +++ b/packages/libndsfpc/examples/time/timercallback/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux 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 i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -211,6 +211,14 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif +ifndef CROSSCOMPILE +BUILDFULLNATIVE=1 +export BUILDFULLNATIVE +endif +ifdef BUILDFULLNATIVE +BUILDNATIVE=1 +export BUILDNATIVE +endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -260,11 +268,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -363,6 +373,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=timercallback endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=timercallback +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=timercallback endif @@ -474,6 +487,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=timercallback endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=timercallback +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=timercallback endif @@ -501,6 +517,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=timercallback endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=timercallback +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=timercallback +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -567,6 +589,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -678,6 +703,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -705,6 +733,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -771,6 +805,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -882,6 +919,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -909,6 +949,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1138,6 +1184,14 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif +ifneq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=lnx +endif +endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= @@ -1267,6 +1321,20 @@ BATCHEXT=.sh EXEEXT= SHORTSUFFIX=aix endif +ifeq ($(OS_TARGET),java) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=java +endif +ifeq ($(CPU_TARGET),jvm) +ifeq ($(OS_TARGET),android) +OEXT=.class +ASMEXT=.j +SHAREDLIBEXT=.jar +SHORTSUFFIX=android +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1685,6 +1753,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1981,6 +2057,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2053,6 +2137,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2393,17 +2493,12 @@ 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),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT |