diff options
Diffstat (limited to 'packages/libndsfpc/examples/graphics/3D/nehe')
13 files changed, 51 insertions, 2891 deletions
diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile index 915c88a82a..da5bf4a990 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -490,12 +484,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -526,9 +514,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -568,21 +553,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -979,21 +952,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1726,24 +1684,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1834,15 +1774,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1960,15 +1891,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1978,33 +1900,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2283,7 +2178,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2296,7 +2190,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -2396,9 +2289,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -2516,10 +2406,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -3370,34 +3256,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3538,20 +3396,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3734,20 +3578,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3762,48 +3592,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif ifdef TARGET_DIRS_LESSON01 lesson01_all: $(MAKE) -C lesson01 all diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile index ab719b839c..0921c07c6a 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson01 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson01 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson01 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson01 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson01 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile index 37b6381c8e..707925d2cd 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson02 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson02 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson02 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson02 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson02 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile index c40c14b5e9..feea41621e 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson03 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson03 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson03 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson03 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson03 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile index 72eb2c2c94..17b60f552a 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson04 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson04 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson04 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson04 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson04 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile index a88dd699cf..0688e18020 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson05 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson05 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson05 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson05 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson05 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile index 9195994097..1a6fdc5b13 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson06 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson06 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson06 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson06 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson06 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile index e8bc8d2f0f..34050ff090 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson07 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson07 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson07 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson07 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson07 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile index 2634018363..2c2a9e973e 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson08 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson08 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson08 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson08 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson08 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile index 71a21eee0b..739ff721d1 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson09 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson09 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson09 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson09 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson09 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile index 2c68ec9fdc..c32995649e 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson10 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson10 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson10 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson10 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson10 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile index 522b9d4de7..0e0fb606e4 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson10b -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson10b endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson10b endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson10b -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson10b -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile index 92a22996c1..e46ad3d64b 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga 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 x86_64-dragonfly 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 mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -186,12 +186,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -502,12 +496,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=lesson11 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=lesson11 endif @@ -538,9 +526,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=lesson11 endif @@ -580,21 +565,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=lesson11 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=lesson11 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=* endif @@ -754,12 +727,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=* endif @@ -790,9 +757,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=* endif @@ -832,21 +796,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1006,12 +958,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1042,9 +988,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -1084,21 +1027,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-Xm @@ -1259,12 +1190,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_OPTIONS+=-Xm endif @@ -1295,9 +1220,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-Xm endif @@ -1337,21 +1259,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_OPTIONS+=-Xm -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1511,12 +1421,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1547,9 +1451,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1589,21 +1490,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=$(BIN) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1763,12 +1652,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1799,9 +1682,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1841,21 +1721,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2251,21 +2119,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2998,24 +2851,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3106,15 +2941,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3232,15 +3058,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3250,33 +3067,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_LIBNDSFPC=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3555,7 +3345,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3568,7 +3357,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3668,9 +3456,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3862,7 +3647,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3948,10 +3733,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo |