diff options
Diffstat (limited to 'packages/libndsfpc/examples/graphics/3D')
28 files changed, 536 insertions, 1946 deletions
diff --git a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile index a6eceff057..4cfdb519b7 100644 --- a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=3DBothScreens endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=3DBothScreens -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=3DBothScreens endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=3DBothScreens endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=3DBothScreens -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=3DBothScreens endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=3DBothScreens endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=3DBothScreens endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=3DBothScreens endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile index 50d4e3f166..54b043a799 100644 --- a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=BoxTest endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=BoxTest -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=BoxTest endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BoxTest endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=BoxTest -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=BoxTest endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=BoxTest endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=BoxTest endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=BoxTest endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile index 992e3dc78a..5d9d69d0e1 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=DisplayList endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=DisplayList -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=DisplayList endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DisplayList endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=DisplayList -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=DisplayList endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=DisplayList endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=DisplayList endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=DisplayList endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile index 355fb9e526..6bf354f509 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=DisplayList2 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=DisplayList2 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=DisplayList2 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DisplayList2 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=DisplayList2 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=DisplayList2 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=DisplayList2 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=DisplayList2 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=DisplayList2 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile index 3916132080..753ccec47f 100644 --- a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=EnvMapping endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=EnvMapping -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=EnvMapping endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=EnvMapping endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=EnvMapping -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=EnvMapping endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=EnvMapping endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=EnvMapping endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=EnvMapping endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Makefile index 920692b278..6a4e52f5de 100644 --- a/packages/libndsfpc/examples/graphics/3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -358,9 +358,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=3D_Both_Screens BoxTest Display_List Display_List_2 Env_Mapping Mixed_Text_3D Ortho Paletted_Cube Picking Simple_Quad Simple_Tri Textured_Cube Textured_Quad Toon_Shading nehe endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1336,15 +1330,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1480,15 +1465,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1516,7 +1492,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -1525,7 +1501,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2805,23 +2781,6 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_3D_BOTH_SCREENS=1 -TARGET_DIRS_BOXTEST=1 -TARGET_DIRS_DISPLAY_LIST=1 -TARGET_DIRS_DISPLAY_LIST_2=1 -TARGET_DIRS_ENV_MAPPING=1 -TARGET_DIRS_MIXED_TEXT_3D=1 -TARGET_DIRS_ORTHO=1 -TARGET_DIRS_PALETTED_CUBE=1 -TARGET_DIRS_PICKING=1 -TARGET_DIRS_SIMPLE_QUAD=1 -TARGET_DIRS_SIMPLE_TRI=1 -TARGET_DIRS_TEXTURED_CUBE=1 -TARGET_DIRS_TEXTURED_QUAD=1 -TARGET_DIRS_TOON_SHADING=1 -TARGET_DIRS_NEHE=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 @@ -3077,23 +3036,6 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_3D_BOTH_SCREENS=1 -TARGET_DIRS_BOXTEST=1 -TARGET_DIRS_DISPLAY_LIST=1 -TARGET_DIRS_DISPLAY_LIST_2=1 -TARGET_DIRS_ENV_MAPPING=1 -TARGET_DIRS_MIXED_TEXT_3D=1 -TARGET_DIRS_ORTHO=1 -TARGET_DIRS_PALETTED_CUBE=1 -TARGET_DIRS_PICKING=1 -TARGET_DIRS_SIMPLE_QUAD=1 -TARGET_DIRS_SIMPLE_TRI=1 -TARGET_DIRS_TEXTURED_CUBE=1 -TARGET_DIRS_TEXTURED_QUAD=1 -TARGET_DIRS_TOON_SHADING=1 -TARGET_DIRS_NEHE=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 @@ -3145,7 +3087,7 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 TARGET_DIRS_DISPLAY_LIST=1 @@ -3162,7 +3104,7 @@ TARGET_DIRS_TEXTURED_QUAD=1 TARGET_DIRS_TOON_SHADING=1 TARGET_DIRS_NEHE=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_3D_BOTH_SCREENS=1 TARGET_DIRS_BOXTEST=1 TARGET_DIRS_DISPLAY_LIST=1 diff --git a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile index c731d6f508..a05f710fac 100644 --- a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=MixedText3D endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=MixedText3D -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=MixedText3D endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=MixedText3D endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=MixedText3D -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=MixedText3D endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=MixedText3D endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=MixedText3D endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=MixedText3D endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile index f0c6bf7fe7..fbb119169a 100644 --- a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=Ortho endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=Ortho -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=Ortho endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Ortho endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=Ortho -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=Ortho endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=Ortho endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=Ortho endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=Ortho endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile index 8339d7527e..3bffa27f4f 100644 --- a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=PalettedCube endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=PalettedCube -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=PalettedCube endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=PalettedCube endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=PalettedCube -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=PalettedCube endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=PalettedCube endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=PalettedCube endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=PalettedCube endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile index 5801e8f54a..12d1bde979 100644 --- a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=Picking endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=Picking -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=Picking endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Picking endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=Picking -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=Picking endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=Picking endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=Picking endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=Picking endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile index 916a95c64e..a6ddd25766 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=SimpleQuad endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=SimpleQuad -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=SimpleQuad endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SimpleQuad endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=SimpleQuad -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=SimpleQuad endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=SimpleQuad endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=SimpleQuad endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=SimpleQuad endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile index 683275c530..e76e409ed6 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=SimpleTri endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=SimpleTri -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=SimpleTri endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SimpleTri endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=SimpleTri -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=SimpleTri endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=SimpleTri endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=SimpleTri endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=SimpleTri endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile index 722cdb6569..4c07cc6785 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=TexturedCube endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=TexturedCube -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=TexturedCube endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=TexturedCube endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=TexturedCube -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=TexturedCube endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=TexturedCube endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=TexturedCube endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=TexturedCube endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile index aa1a64678d..fbe3441783 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=TexturedQuad endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=TexturedQuad -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=TexturedQuad endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=TexturedQuad endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=TexturedQuad -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=TexturedQuad endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=TexturedQuad endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=TexturedQuad endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=TexturedQuad endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile index c661b2914e..296ad1e5fa 100644 --- a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=ToonShading endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=ToonShading -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=ToonShading endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=ToonShading endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=ToonShading -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=ToonShading endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=ToonShading endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=ToonShading endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=ToonShading endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile index 4bfb5951aa..90672a22c0 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -358,9 +358,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=lesson01 lesson02 lesson03 lesson04 lesson05 lesson06 lesson07 lesson08 lesson09 lesson10 lesson10b lesson11 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1336,15 +1330,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1480,15 +1465,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1516,7 +1492,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -1525,7 +1501,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2778,20 +2754,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3002,20 +2964,6 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_LESSON01=1 -TARGET_DIRS_LESSON02=1 -TARGET_DIRS_LESSON03=1 -TARGET_DIRS_LESSON04=1 -TARGET_DIRS_LESSON05=1 -TARGET_DIRS_LESSON06=1 -TARGET_DIRS_LESSON07=1 -TARGET_DIRS_LESSON08=1 -TARGET_DIRS_LESSON09=1 -TARGET_DIRS_LESSON10=1 -TARGET_DIRS_LESSON10B=1 -TARGET_DIRS_LESSON11=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 @@ -3058,7 +3006,7 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 TARGET_DIRS_LESSON03=1 @@ -3072,7 +3020,7 @@ TARGET_DIRS_LESSON10=1 TARGET_DIRS_LESSON10B=1 TARGET_DIRS_LESSON11=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_LESSON01=1 TARGET_DIRS_LESSON02=1 TARGET_DIRS_LESSON03=1 diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile index 468b183068..952fe9c3f2 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson01 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson01 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson01 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson01 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson01 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile index 1875d210f5..7cc84dfd46 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson02 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson02 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson02 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson02 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson02 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile index 5320223b55..cc0256810d 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson03 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson03 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson03 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson03 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson03 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile index c6b9698933..c90efbadff 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson04 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson04 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson04 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson04 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson04 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile index a0fa0c7b42..a66f58c9c9 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson05 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson05 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson05 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson05 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson05 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile index 3f1dda1874..0338d4793c 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson06 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson06 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson06 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson06 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson06 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile index dc152298f2..bfade2816f 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson07 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson07 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson07 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson07 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson07 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile index 48c0e607e7..0a0388f4c4 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson08 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson08 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson08 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson08 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson08 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile index dd56c57ff3..07325adf8b 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson09 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson09 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson09 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson09 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson09 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile index 585be936cc..f962c224d6 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson10 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson10 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson10 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson10 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson10 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile index 2cde38b75e..f4c1167773 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson10b endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson10b -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson10b endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson10b endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson10b endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile index d4bb3c22b8..38f06ae89a 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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 wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded 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 wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -370,9 +370,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=lesson11 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=lesson11 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=lesson11 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=lesson11 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=lesson11 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_UNITS+=* endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_UNITS+=* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_UNITS+=* endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_UNITS+=* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_UNITS+=* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),i386-qnx) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),i386-netware) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -934,9 +919,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* -endif ifeq ($(FULL_TARGET),m68k-netbsd) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif @@ -946,10 +928,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* $(BIN)/* endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1145,9 +1127,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_OPTIONS+=-Xm endif @@ -1193,9 +1172,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-Xm -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_OPTIONS+=-Xm endif @@ -1205,10 +1181,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-Xm endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1403,9 +1379,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1451,9 +1424,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_TARGETDIR+=$(BIN) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_TARGETDIR+=$(BIN) endif @@ -1463,10 +1433,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_TARGETDIR+=$(BIN) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_TARGETDIR+=$(BIN) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1661,9 +1631,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),i386-netware) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1709,9 +1676,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_UNITTARGETDIR+=$(BUILD) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_UNITTARGETDIR+=$(BUILD) endif @@ -1721,10 +1685,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override COMPILER_UNITTARGETDIR+=$(BUILD) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2638,15 +2602,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -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),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2782,15 +2737,6 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -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),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2818,7 +2764,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -2827,7 +2773,7 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 @@ -3867,7 +3813,11 @@ ifdef INSTALL_BUILDUNIT override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) endif ifdef INSTALLPPUFILES +ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +else +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +endif ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) |