diff options
Diffstat (limited to 'packages/libogcfpc')
29 files changed, 3075 insertions, 317 deletions
diff --git a/packages/libogcfpc/Makefile b/packages/libogcfpc/Makefile index a96b41c9b1..738cf0e6a9 100644 --- a/packages/libogcfpc/Makefile +++ b/packages/libogcfpc/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/11/11] +# 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 jvm-java jvm-android +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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: @@ -541,6 +541,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= @@ -676,12 +684,14 @@ 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) @@ -1078,6 +1088,13 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=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 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1337,6 +1354,13 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=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 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2099,96 +2123,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: diff --git a/packages/libogcfpc/examples/Makefile b/packages/libogcfpc/examples/Makefile index 7bedcc7b06..c1b7f9817b 100644 --- a/packages/libogcfpc/examples/Makefile +++ b/packages/libogcfpc/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 devices filesystem graphics template endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=audio devices filesystem graphics template +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio devices filesystem graphics template endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=audio devices filesystem graphics template endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=audio devices filesystem graphics template +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=audio devices filesystem graphics template endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=audio devices filesystem graphics template endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=audio devices filesystem graphics template +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=audio devices filesystem graphics template +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -2628,6 +2706,13 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_AUDIO=1 TARGET_DIRS_DEVICES=1 @@ -2691,6 +2776,20 @@ TARGET_DIRS_FILESYSTEM=1 TARGET_DIRS_GRAPHICS=1 TARGET_DIRS_TEMPLATE=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_AUDIO=1 +TARGET_DIRS_DEVICES=1 +TARGET_DIRS_FILESYSTEM=1 +TARGET_DIRS_GRAPHICS=1 +TARGET_DIRS_TEMPLATE=1 +endif ifdef TARGET_DIRS_AUDIO audio_all: $(MAKE) -C audio all diff --git a/packages/libogcfpc/examples/audio/Makefile b/packages/libogcfpc/examples/audio/Makefile index 0613dd900b..ae8113e976 100644 --- a/packages/libogcfpc/examples/audio/Makefile +++ b/packages/libogcfpc/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+=modplay mp3player endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=modplay mp3player +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=modplay mp3player endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=modplay mp3player endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=modplay mp3player +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=modplay mp3player endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=modplay mp3player endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=modplay mp3player +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=modplay mp3player +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 @@ -2451,6 +2526,10 @@ ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 @@ -2487,6 +2566,14 @@ ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_MODPLAY=1 TARGET_DIRS_MP3PLAYER=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_MODPLAY=1 +TARGET_DIRS_MP3PLAYER=1 +endif ifdef TARGET_DIRS_MODPLAY modplay_all: $(MAKE) -C modplay all diff --git a/packages/libogcfpc/examples/audio/modplay/Makefile b/packages/libogcfpc/examples/audio/modplay/Makefile index 8d0870ad1b..82a59dd61b 100644 --- a/packages/libogcfpc/examples/audio/modplay/Makefile +++ b/packages/libogcfpc/examples/audio/modplay/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+=modplay endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=modplay +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=modplay endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=modplay endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=modplay +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=modplay endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=modplay endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=modplay +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=modplay +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/audio/mp3player/Makefile b/packages/libogcfpc/examples/audio/mp3player/Makefile index be07804f43..7500a1d34e 100644 --- a/packages/libogcfpc/examples/audio/mp3player/Makefile +++ b/packages/libogcfpc/examples/audio/mp3player/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+=playmp3 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=playmp3 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=playmp3 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=playmp3 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=playmp3 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=playmp3 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=playmp3 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=playmp3 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=playmp3 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/devices/Makefile b/packages/libogcfpc/examples/devices/Makefile index f3e44b1a17..0453d938fc 100644 --- a/packages/libogcfpc/examples/devices/Makefile +++ b/packages/libogcfpc/examples/devices/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+=network usbkeyboard usbgecko endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=network usbkeyboard usbgecko endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=network usbkeyboard usbgecko endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=network usbkeyboard usbgecko endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=network usbkeyboard usbgecko endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=network usbkeyboard usbgecko +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=network usbkeyboard usbgecko +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 @@ -2510,6 +2586,11 @@ TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 @@ -2555,6 +2636,16 @@ TARGET_DIRS_NETWORK=1 TARGET_DIRS_USBKEYBOARD=1 TARGET_DIRS_USBGECKO=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_NETWORK=1 +TARGET_DIRS_USBKEYBOARD=1 +TARGET_DIRS_USBGECKO=1 +endif ifdef TARGET_DIRS_NETWORK network_all: $(MAKE) -C network all diff --git a/packages/libogcfpc/examples/devices/network/Makefile b/packages/libogcfpc/examples/devices/network/Makefile index 11069f9cf9..a815e93b6f 100644 --- a/packages/libogcfpc/examples/devices/network/Makefile +++ b/packages/libogcfpc/examples/devices/network/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+=sockettest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=sockettest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=sockettest endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=sockettest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=sockettest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=sockettest endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=sockettest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=sockettest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=sockettest +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_SOCKETTEST=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_SOCKETTEST=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_SOCKETTEST=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_SOCKETTEST=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_SOCKETTEST=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_SOCKETTEST=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_SOCKETTEST=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_SOCKETTEST=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_SOCKETTEST=1 +endif ifdef TARGET_DIRS_SOCKETTEST sockettest_all: $(MAKE) -C sockettest all diff --git a/packages/libogcfpc/examples/devices/network/sockettest/Makefile b/packages/libogcfpc/examples/devices/network/sockettest/Makefile index cece84a3fa..c6b5a6a10f 100644 --- a/packages/libogcfpc/examples/devices/network/sockettest/Makefile +++ b/packages/libogcfpc/examples/devices/network/sockettest/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+=sockettest endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=sockettest +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=sockettest endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=sockettest endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=sockettest +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=sockettest endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=sockettest endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=sockettest +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=sockettest +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/devices/usbgecko/Makefile b/packages/libogcfpc/examples/devices/usbgecko/Makefile index 73d3724444..cec437fe78 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/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+=gdbstub endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=gdbstub +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=gdbstub endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=gdbstub endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=gdbstub +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gdbstub endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=gdbstub endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=gdbstub +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=gdbstub +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_GDBSTUB=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_GDBSTUB=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_GDBSTUB=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_GDBSTUB=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_GDBSTUB=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GDBSTUB=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_GDBSTUB=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_GDBSTUB=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_GDBSTUB=1 +endif ifdef TARGET_DIRS_GDBSTUB gdbstub_all: $(MAKE) -C gdbstub all diff --git a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile index 916db06140..9dabe94ae8 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/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+=gdbstub endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=gdbstub +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=gdbstub endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=gdbstub endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=gdbstub +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gdbstub endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gdbstub endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=gdbstub +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=gdbstub +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections @@ -979,6 +1025,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif @@ -1090,6 +1139,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif @@ -1117,6 +1169,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -Xm -k--gc-sections endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-g -Xm -k--gc-sections +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/devices/usbkeyboard/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/Makefile index f28dfdd686..4396b0a688 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/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+=basic_stdin endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=basic_stdin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=basic_stdin endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=basic_stdin endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=basic_stdin +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=basic_stdin endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=basic_stdin endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=basic_stdin +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=basic_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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_BASIC_STDIN=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_BASIC_STDIN=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_BASIC_STDIN=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_BASIC_STDIN=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_BASIC_STDIN=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_BASIC_STDIN=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_BASIC_STDIN=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_BASIC_STDIN=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_BASIC_STDIN=1 +endif ifdef TARGET_DIRS_BASIC_STDIN basic_stdin_all: $(MAKE) -C basic_stdin all diff --git a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile index 5009383c86..f852d46865 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/basic_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)) @@ -366,6 +376,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=basic_stdin endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=basic_stdin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=basic_stdin endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=basic_stdin endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=basic_stdin +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=basic_stdin endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=basic_stdin endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=basic_stdin +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=basic_stdin +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/filesystem/Makefile b/packages/libogcfpc/examples/filesystem/Makefile index e3175f8bfc..e07cc5f6f4 100644 --- a/packages/libogcfpc/examples/filesystem/Makefile +++ b/packages/libogcfpc/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+=directory endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=directory +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=directory endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=directory endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=directory +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=directory endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=directory endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=directory +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=directory +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_DIRECTORY=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_DIRECTORY=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_DIRECTORY=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_DIRECTORY=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_DIRECTORY=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_DIRECTORY=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_DIRECTORY=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_DIRECTORY=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_DIRECTORY=1 +endif ifdef TARGET_DIRS_DIRECTORY directory_all: $(MAKE) -C directory all diff --git a/packages/libogcfpc/examples/filesystem/directory/Makefile b/packages/libogcfpc/examples/filesystem/directory/Makefile index 8d92bb5613..746f3b27ea 100644 --- a/packages/libogcfpc/examples/filesystem/directory/Makefile +++ b/packages/libogcfpc/examples/filesystem/directory/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+=directory endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=directory +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=directory endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=directory endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=directory +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=directory endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=directory endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=directory +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=directory +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/Makefile b/packages/libogcfpc/examples/graphics/Makefile index 931c2a5ad5..add055f1f5 100644 --- a/packages/libogcfpc/examples/graphics/Makefile +++ b/packages/libogcfpc/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+=gx endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=gx +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=gx endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=gx endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=gx +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gx endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=gx endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=gx +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=gx +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_GX=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_GX=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_GX=1 endif @@ -2392,6 +2466,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_GX=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_GX=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GX=1 endif @@ -2419,6 +2496,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_GX=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_GX=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_GX=1 +endif ifdef TARGET_DIRS_GX gx_all: $(MAKE) -C gx all diff --git a/packages/libogcfpc/examples/graphics/gx/Makefile b/packages/libogcfpc/examples/graphics/gx/Makefile index d11e92aa0a..96de5a7078 100644 --- a/packages/libogcfpc/examples/graphics/gx/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/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+=gxSprites neheGX triangle endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=gxSprites neheGX triangle +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=gxSprites neheGX triangle endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=gxSprites neheGX triangle endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=gxSprites neheGX triangle +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=gxSprites neheGX triangle endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=gxSprites neheGX triangle endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=gxSprites neheGX triangle +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=gxSprites neheGX triangle +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 @@ -2510,6 +2586,11 @@ TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 @@ -2555,6 +2636,16 @@ TARGET_DIRS_GXSPRITES=1 TARGET_DIRS_NEHEGX=1 TARGET_DIRS_TRIANGLE=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_GXSPRITES=1 +TARGET_DIRS_NEHEGX=1 +TARGET_DIRS_TRIANGLE=1 +endif ifdef TARGET_DIRS_GXSPRITES gxSprites_all: $(MAKE) -C gxSprites all diff --git a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile b/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile index 72809e6cc6..b80a8578af 100644 --- a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/gxSprites/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+=gxsprites endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=gxsprites +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=gxsprites endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=gxsprites endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=gxsprites +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=gxsprites endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=gxsprites endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=gxsprites +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=gxsprites +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile index 307abf5de9..3729ccd20c 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/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+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=lesson1 lesson2 lesson3 lesson4 lesson5 lesson6 lesson7 lesson8 lesson9 +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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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 @@ -2457,6 +2528,17 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -2864,6 +2946,17 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LESSON1=1 TARGET_DIRS_LESSON2=1 @@ -2963,6 +3056,28 @@ TARGET_DIRS_LESSON7=1 TARGET_DIRS_LESSON8=1 TARGET_DIRS_LESSON9=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_LESSON1=1 +TARGET_DIRS_LESSON2=1 +TARGET_DIRS_LESSON3=1 +TARGET_DIRS_LESSON4=1 +TARGET_DIRS_LESSON5=1 +TARGET_DIRS_LESSON6=1 +TARGET_DIRS_LESSON7=1 +TARGET_DIRS_LESSON8=1 +TARGET_DIRS_LESSON9=1 +endif ifdef TARGET_DIRS_LESSON1 lesson1_all: $(MAKE) -C lesson1 all diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile index afa8e64b72..d642d53f4b 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/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+=lesson1 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson1 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson1 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson1 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson1 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson1 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson1 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson1 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile index 7fb79538f9..66f0ac2296 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/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+=lesson2 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson2 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson2 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson2 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson2 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson2 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson2 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson2 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile index 11162524d7..60602df155 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/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+=lesson3 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson3 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson3 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson3 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson3 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson3 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson3 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson3 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson3 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile index 4d846adc1d..cd5266227a 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/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+=lesson4 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson4 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson4 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson4 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson4 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson4 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson4 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson4 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson4 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile index 0c6a510634..b8574ac960 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/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+=lesson5 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson5 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson5 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson5 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson5 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson5 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson5 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson5 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson5 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile index 7e6b9e74a6..6f568f52e6 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/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+=lesson6 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson6 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson6 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson6 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson6 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson6 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson6 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson6 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson6 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile index 5549640109..5d411e736c 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/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+=lesson7 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson7 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson7 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson7 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson7 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson7 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson7 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson7 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson7 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile index 112ead5295..80da056377 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/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+=lesson8 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson8 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson8 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson8 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson8 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson8 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson8 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson8 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson8 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile index 1e5a5a25b5..b1a06bea57 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/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+=lesson9 endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=lesson9 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson9 endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=lesson9 endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=lesson9 +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson9 endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=lesson9 endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=lesson9 +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=lesson9 +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/graphics/gx/triangle/Makefile b/packages/libogcfpc/examples/graphics/gx/triangle/Makefile index f411bed946..08eab3e9eb 100644 --- a/packages/libogcfpc/examples/graphics/gx/triangle/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/triangle/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+=triangle endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=triangle +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=triangle endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=triangle endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=triangle +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=triangle endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=triangle endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=triangle +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=triangle +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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/libogcfpc/examples/template/Makefile b/packages/libogcfpc/examples/template/Makefile index d21e58817b..e4c3f4b50f 100644 --- a/packages/libogcfpc/examples/template/Makefile +++ b/packages/libogcfpc/examples/template/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+=template endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=template +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=template endif @@ -477,6 +490,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=template endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=template +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=template endif @@ -504,6 +520,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=template endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=template +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=template +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 *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -774,6 +808,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -885,6 +922,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -912,6 +952,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_FILES+=*.elf *.o *.s *.h *.bin *.map $(BUILD)/* $(INC)/* +endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-g -Xm @@ -979,6 +1025,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 @@ -1090,6 +1139,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 @@ -1117,6 +1169,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 @@ -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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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_LIBOGCFPC=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 |