diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-10-16 00:27:27 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-10-16 00:27:27 +0000 |
| commit | 30d510169991bca509f3eed6b4e61c26ddf01fda (patch) | |
| tree | 15bcfdf32440b14f3d6f4051cd10afa7458cb624 /packages/libndsfpc/examples | |
| parent | 20a29eadf838c9e18577acbd2cec0f0b18a7b6d4 (diff) | |
| download | fpc-30d510169991bca509f3eed6b4e61c26ddf01fda.tar.gz | |
* Update all fpcsrc Makefile's using latest fpcmake version 2017-09-21 rev 37286
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@37462 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/libndsfpc/examples')
100 files changed, 1748 insertions, 6490 deletions
diff --git a/packages/libndsfpc/examples/Makefile b/packages/libndsfpc/examples/Makefile index f277c337b9..fb04f4778a 100644 --- a/packages/libndsfpc/examples/Makefile +++ b/packages/libndsfpc/examples/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+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=audio card debugging ds_motion dswifi filesystem gl2d graphics hello_world input time 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 @@ -2769,19 +2745,6 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_CARD=1 -TARGET_DIRS_DEBUGGING=1 -TARGET_DIRS_DS_MOTION=1 -TARGET_DIRS_DSWIFI=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GL2D=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_HELLO_WORLD=1 -TARGET_DIRS_INPUT=1 -TARGET_DIRS_TIME=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 @@ -2977,19 +2940,6 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_AUDIO=1 -TARGET_DIRS_CARD=1 -TARGET_DIRS_DEBUGGING=1 -TARGET_DIRS_DS_MOTION=1 -TARGET_DIRS_DSWIFI=1 -TARGET_DIRS_FILESYSTEM=1 -TARGET_DIRS_GL2D=1 -TARGET_DIRS_GRAPHICS=1 -TARGET_DIRS_HELLO_WORLD=1 -TARGET_DIRS_INPUT=1 -TARGET_DIRS_TIME=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 @@ -3029,7 +2979,7 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 TARGET_DIRS_DEBUGGING=1 @@ -3042,7 +2992,7 @@ TARGET_DIRS_HELLO_WORLD=1 TARGET_DIRS_INPUT=1 TARGET_DIRS_TIME=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_AUDIO=1 TARGET_DIRS_CARD=1 TARGET_DIRS_DEBUGGING=1 diff --git a/packages/libndsfpc/examples/audio/Makefile b/packages/libndsfpc/examples/audio/Makefile index 410c4e1168..cdd2d8d413 100644 --- a/packages/libndsfpc/examples/audio/Makefile +++ b/packages/libndsfpc/examples/audio/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+=maxmod micrecord endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=maxmod micrecord -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=maxmod micrecord endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=maxmod micrecord endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=maxmod micrecord -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=maxmod micrecord endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=maxmod micrecord endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=maxmod micrecord endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=maxmod micrecord 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 @@ -2688,10 +2664,6 @@ ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_MAXMOD=1 -TARGET_DIRS_MICRECORD=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 @@ -2752,10 +2724,6 @@ ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_MAXMOD=1 -TARGET_DIRS_MICRECORD=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 @@ -2768,11 +2736,11 @@ ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_MAXMOD=1 TARGET_DIRS_MICRECORD=1 endif diff --git a/packages/libndsfpc/examples/audio/maxmod/Makefile b/packages/libndsfpc/examples/audio/maxmod/Makefile index 5c5f60b31a..32fbb5d07e 100644 --- a/packages/libndsfpc/examples/audio/maxmod/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/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+=audio_modes basic_sound reverb song_events_example song_events_example2 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 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 @@ -2715,13 +2691,6 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_AUDIO_MODES=1 -TARGET_DIRS_BASIC_SOUND=1 -TARGET_DIRS_REVERB=1 -TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 -TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2827,13 +2796,6 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_AUDIO_MODES=1 -TARGET_DIRS_BASIC_SOUND=1 -TARGET_DIRS_REVERB=1 -TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 -TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2855,14 +2817,14 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 TARGET_DIRS_REVERB=1 diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile index 20a14a1c12..1c44b700a2 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/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+=audio_modes endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=audio_modes -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=audio_modes endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=audio_modes endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=audio_modes -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=audio_modes endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=audio_modes endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=audio_modes endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=audio_modes endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=soundbank.bin endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=soundbank.bin -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=soundbank.bin endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=soundbank.bin -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=soundbank.bin endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=soundbank.bin endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=soundbank.bin endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=soundbank.bin endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,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 @@ -934,9 +919,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 @@ -946,10 +928,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) @@ -1144,9 +1126,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 @@ -1192,9 +1171,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 @@ -1204,10 +1180,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) @@ -1403,9 +1379,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 @@ -1451,9 +1424,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 @@ -1463,10 +1433,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) @@ -1661,9 +1631,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 @@ -1709,9 +1676,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 @@ -1721,10 +1685,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) @@ -1919,9 +1883,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 @@ -1967,9 +1928,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 @@ -1979,10 +1937,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) @@ -2896,15 +2854,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 @@ -3040,15 +2989,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 @@ -3076,7 +3016,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 @@ -3085,7 +3025,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 @@ -4152,7 +4092,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/audio/maxmod/basic_sound/Makefile b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile index f46fbafe17..9924b92f57 100644 --- a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/basic_sound/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+=basic_sound endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=basic_sound -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=basic_sound endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=basic_sound endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=basic_sound -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=basic_sound endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=basic_sound endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=basic_sound endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=basic_sound endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,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 @@ -934,9 +919,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 @@ -946,10 +928,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) @@ -1144,9 +1126,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 @@ -1192,9 +1171,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 @@ -1204,10 +1180,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) @@ -1403,9 +1379,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 @@ -1451,9 +1424,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 @@ -1463,10 +1433,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) @@ -1661,9 +1631,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 @@ -1709,9 +1676,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 @@ -1721,10 +1685,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) @@ -1919,9 +1883,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 @@ -1967,9 +1928,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 @@ -1979,10 +1937,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) @@ -2896,15 +2854,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 @@ -3040,15 +2989,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 @@ -3076,7 +3016,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 @@ -3085,7 +3025,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 @@ -4152,7 +4092,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/audio/maxmod/reverb/Makefile b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile index 3c562b2209..9a58e35f65 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/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+=reverb endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=reverb -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=reverb endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=reverb endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=reverb -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=reverb endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=reverb endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=reverb endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=reverb endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,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 @@ -934,9 +919,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 @@ -946,10 +928,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) @@ -1144,9 +1126,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 @@ -1192,9 +1171,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 @@ -1204,10 +1180,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) @@ -1403,9 +1379,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 @@ -1451,9 +1424,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 @@ -1463,10 +1433,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) @@ -1661,9 +1631,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 @@ -1709,9 +1676,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 @@ -1721,10 +1685,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) @@ -1919,9 +1883,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 @@ -1967,9 +1928,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 @@ -1979,10 +1937,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) @@ -2896,15 +2854,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 @@ -3040,15 +2989,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 @@ -3076,7 +3016,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 @@ -3085,7 +3025,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 @@ -4152,7 +4092,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/audio/maxmod/song_events_example/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile index 8db58a0858..bc0d8e5bf7 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/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+=song_events_example endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=song_events_example -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=song_events_example endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=song_events_example -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=song_events_example endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=song_events_example endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=song_events_example endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=song_events_example endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=mmsolution.bin -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=mmsolution.bin endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=mmsolution.bin -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=mmsolution.bin endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=mmsolution.bin endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,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 @@ -934,9 +919,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 @@ -946,10 +928,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) @@ -1144,9 +1126,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 @@ -1192,9 +1171,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 @@ -1204,10 +1180,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) @@ -1403,9 +1379,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 @@ -1451,9 +1424,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 @@ -1463,10 +1433,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) @@ -1661,9 +1631,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 @@ -1709,9 +1676,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 @@ -1721,10 +1685,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) @@ -1919,9 +1883,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 @@ -1967,9 +1928,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 @@ -1979,10 +1937,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) @@ -2896,15 +2854,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 @@ -3040,15 +2989,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 @@ -3076,7 +3016,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 @@ -3085,7 +3025,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 @@ -4152,7 +4092,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/audio/maxmod/song_events_example2/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile index 0d9526578c..35ac83cde1 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/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+=song_events_example2 endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=song_events_example2 -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=song_events_example2 endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=song_events_example2 -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=song_events_example2 endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=song_events_example2 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=song_events_example2 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -628,9 +622,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=mmsolution.bin -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=mmsolution.bin endif @@ -676,9 +667,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=mmsolution.bin -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=mmsolution.bin endif @@ -688,10 +676,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=mmsolution.bin endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=mmsolution.bin endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -886,9 +874,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 @@ -934,9 +919,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 @@ -946,10 +928,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) @@ -1144,9 +1126,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 @@ -1192,9 +1171,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 @@ -1204,10 +1180,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) @@ -1403,9 +1379,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 @@ -1451,9 +1424,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 @@ -1463,10 +1433,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) @@ -1661,9 +1631,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 @@ -1709,9 +1676,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 @@ -1721,10 +1685,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) @@ -1919,9 +1883,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 @@ -1967,9 +1928,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 @@ -1979,10 +1937,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) @@ -2896,15 +2854,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 @@ -3040,15 +2989,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 @@ -3076,7 +3016,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 @@ -3085,7 +3025,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 @@ -4152,7 +4092,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/audio/maxmod/streaming/Makefile b/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile index a3d6db86c6..1d98c09ebf 100644 --- a/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/streaming/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+=streaming endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=streaming -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=streaming endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=streaming endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=streaming -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=streaming endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=streaming endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=streaming endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=streaming 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/audio/micrecord/Makefile b/packages/libndsfpc/examples/audio/micrecord/Makefile index 9f9c94ec64..eaff62f29e 100644 --- a/packages/libndsfpc/examples/audio/micrecord/Makefile +++ b/packages/libndsfpc/examples/audio/micrecord/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=micrecord endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=micrecord -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=micrecord endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=micrecord endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=micrecord -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=micrecord endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=micrecord endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=micrecord endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=micrecord endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/card/Makefile b/packages/libndsfpc/examples/card/Makefile index 802e7cf698..715b3e7408 100644 --- a/packages/libndsfpc/examples/card/Makefile +++ b/packages/libndsfpc/examples/card/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+=eeprom endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=eeprom -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=eeprom endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=eeprom -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=eeprom endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=eeprom 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_EEPROM=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_EEPROM=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_EEPROM=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_EEPROM=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_EEPROM=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_EEPROM=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_EEPROM=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_EEPROM=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_EEPROM=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/card/eeprom/Makefile b/packages/libndsfpc/examples/card/eeprom/Makefile index 394550eb46..c453a9873c 100644 --- a/packages/libndsfpc/examples/card/eeprom/Makefile +++ b/packages/libndsfpc/examples/card/eeprom/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=eeprom endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=eeprom -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=eeprom endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=eeprom -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=eeprom endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=eeprom endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=eeprom endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/debugging/Makefile b/packages/libndsfpc/examples/debugging/Makefile index d82e722a7f..d8a16e80d0 100644 --- a/packages/libndsfpc/examples/debugging/Makefile +++ b/packages/libndsfpc/examples/debugging/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+=exceptionTest endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=exceptionTest -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=exceptionTest endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=exceptionTest -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=exceptionTest endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=exceptionTest 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_EXCEPTIONTEST=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_EXCEPTIONTEST=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_EXCEPTIONTEST=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_EXCEPTIONTEST=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_EXCEPTIONTEST=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_EXCEPTIONTEST=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_EXCEPTIONTEST=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_EXCEPTIONTEST=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_EXCEPTIONTEST=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile index 9c5a7538e0..c0a3a0bfd3 100644 --- a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile +++ b/packages/libndsfpc/examples/debugging/exceptionTest/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=exceptionTest endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=exceptionTest -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=exceptionTest endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=exceptionTest -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=exceptionTest endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=exceptionTest endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=exceptionTest endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/ds_motion/Makefile b/packages/libndsfpc/examples/ds_motion/Makefile index b59e2c0585..3395cfdd5f 100644 --- a/packages/libndsfpc/examples/ds_motion/Makefile +++ b/packages/libndsfpc/examples/ds_motion/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=dsMotion endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=dsMotion -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=dsMotion endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=dsMotion endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=dsMotion -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=dsMotion endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=dsMotion endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=dsMotion endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=dsMotion endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/dswifi/Makefile b/packages/libndsfpc/examples/dswifi/Makefile index faaa584f13..bdf809506c 100644 --- a/packages/libndsfpc/examples/dswifi/Makefile +++ b/packages/libndsfpc/examples/dswifi/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+=ap_search autoconnect httpget endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=ap_search autoconnect httpget -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=ap_search autoconnect httpget endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=ap_search autoconnect httpget endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=ap_search autoconnect httpget -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=ap_search autoconnect httpget endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=ap_search autoconnect httpget endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=ap_search autoconnect httpget endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=ap_search autoconnect httpget 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 @@ -2697,11 +2673,6 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_AP_SEARCH=1 -TARGET_DIRS_AUTOCONNECT=1 -TARGET_DIRS_HTTPGET=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 @@ -2777,11 +2748,6 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_AP_SEARCH=1 -TARGET_DIRS_AUTOCONNECT=1 -TARGET_DIRS_HTTPGET=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 @@ -2797,12 +2763,12 @@ TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_AP_SEARCH=1 TARGET_DIRS_AUTOCONNECT=1 TARGET_DIRS_HTTPGET=1 diff --git a/packages/libndsfpc/examples/dswifi/ap_search/Makefile b/packages/libndsfpc/examples/dswifi/ap_search/Makefile index edd0a06c7a..aca69cbcc2 100644 --- a/packages/libndsfpc/examples/dswifi/ap_search/Makefile +++ b/packages/libndsfpc/examples/dswifi/ap_search/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=apSearch endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=apSearch -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=apSearch endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=apSearch endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=apSearch -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=apSearch endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=apSearch endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=apSearch endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=apSearch endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/dswifi/autoconnect/Makefile b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile index bba44b7c11..1b5ad0869b 100644 --- a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile +++ b/packages/libndsfpc/examples/dswifi/autoconnect/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=autoconnect endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=autoconnect -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=autoconnect endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=autoconnect endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=autoconnect -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=autoconnect endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=autoconnect endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=autoconnect endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=autoconnect endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/dswifi/httpget/Makefile b/packages/libndsfpc/examples/dswifi/httpget/Makefile index 0b9b6af698..92c0f664af 100644 --- a/packages/libndsfpc/examples/dswifi/httpget/Makefile +++ b/packages/libndsfpc/examples/dswifi/httpget/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=httpget endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=httpget -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=httpget endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=httpget endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=httpget -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=httpget endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=httpget endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=httpget endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=httpget endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/filesystem/Makefile b/packages/libndsfpc/examples/filesystem/Makefile index 640c5dae15..a2dde4e2b3 100644 --- a/packages/libndsfpc/examples/filesystem/Makefile +++ b/packages/libndsfpc/examples/filesystem/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+=libfat nitrofs endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=libfat nitrofs -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=libfat nitrofs endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=libfat nitrofs endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=libfat nitrofs -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=libfat nitrofs endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=libfat nitrofs endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=libfat nitrofs endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=libfat nitrofs 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 @@ -2688,10 +2664,6 @@ ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_LIBFAT=1 -TARGET_DIRS_NITROFS=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 @@ -2752,10 +2724,6 @@ ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_LIBFAT=1 -TARGET_DIRS_NITROFS=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 @@ -2768,11 +2736,11 @@ ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_LIBFAT=1 TARGET_DIRS_NITROFS=1 endif diff --git a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile index ea7585cd7c..fd0084f4a6 100644 --- a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile +++ b/packages/libndsfpc/examples/filesystem/embedded_gbfs/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 @@ -369,9 +369,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=embedded_gbfs endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=embedded_gbfs -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=embedded_gbfs endif @@ -417,9 +414,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=embedded_gbfs endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=embedded_gbfs -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=embedded_gbfs endif @@ -429,10 +423,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=embedded_gbfs endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=embedded_gbfs endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=embedded_gbfs endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -627,9 +621,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_LOADERS+=data.gbfs endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=data.gbfs -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_LOADERS+=data.gbfs endif @@ -675,9 +666,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=data.gbfs endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=data.gbfs -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_LOADERS+=data.gbfs endif @@ -687,10 +675,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_LOADERS+=data.gbfs endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_LOADERS+=data.gbfs endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_LOADERS+=data.gbfs endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -885,9 +873,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 @@ -933,9 +918,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 @@ -945,10 +927,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1402,9 +1378,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 @@ -1450,9 +1423,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 @@ -1462,10 +1432,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) @@ -1660,9 +1630,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 @@ -1708,9 +1675,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 @@ -1720,10 +1684,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) @@ -1918,9 +1882,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 @@ -1966,9 +1927,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 @@ -1978,10 +1936,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) @@ -2895,15 +2853,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 @@ -3039,15 +2988,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 @@ -3075,7 +3015,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 @@ -3084,7 +3024,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 @@ -4151,7 +4091,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/filesystem/libfat/Makefile b/packages/libndsfpc/examples/filesystem/libfat/Makefile index 29777d7155..5cc096f9ec 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/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+=libfatdir endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=libfatdir -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=libfatdir endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=libfatdir -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=libfatdir endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=libfatdir 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_LIBFATDIR=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_LIBFATDIR=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_LIBFATDIR=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_LIBFATDIR=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_LIBFATDIR=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_LIBFATDIR=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_LIBFATDIR=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_LIBFATDIR=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_LIBFATDIR=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile index 1618dc720f..eef23d610e 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_dir/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=access_dir endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=access_dir -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=access_dir endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=access_dir endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=access_dir -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=access_dir endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=access_dir endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=access_dir endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=access_dir endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/filesystem/libfat/access_file/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile index 5e4c95c3ca..3a271f9e20 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_file/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=access_file endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=access_file -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=access_file endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=access_file endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=access_file -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=access_file endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=access_file endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=access_file endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=access_file endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/filesystem/libfat/libfatdir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile index 8cc2c76c16..ac91b313f5 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/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 @@ -368,9 +368,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=libfatdir endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=libfatdir -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=libfatdir endif @@ -416,9 +413,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=libfatdir -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=libfatdir endif @@ -428,10 +422,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=libfatdir endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=libfatdir endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -626,9 +620,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 @@ -674,9 +665,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 @@ -686,10 +674,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) @@ -884,9 +872,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 @@ -932,9 +917,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 @@ -944,10 +926,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) @@ -1143,9 +1125,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 @@ -1191,9 +1170,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 @@ -1203,10 +1179,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) @@ -1401,9 +1377,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 @@ -1449,9 +1422,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 @@ -1461,10 +1431,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) @@ -1659,9 +1629,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 @@ -1707,9 +1674,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 @@ -1719,10 +1683,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) @@ -2636,15 +2600,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 @@ -2780,15 +2735,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 @@ -2816,7 +2762,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 @@ -2825,7 +2771,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 @@ -3865,7 +3811,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/filesystem/nitrofs/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/Makefile index b429a41a9c..d719f330bd 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/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+=nitrodir endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=nitrodir -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=nitrodir endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=nitrodir -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=nitrodir endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=nitrodir 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_NITRODIR=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_NITRODIR=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_NITRODIR=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_NITRODIR=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_NITRODIR=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_NITRODIR=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_NITRODIR=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_NITRODIR=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_NITRODIR=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile index 39626e7507..4e494c59d7 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/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+=nitrodir endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=nitrodir -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=nitrodir endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=nitrodir -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=nitrodir endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=nitrodir endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=nitrodir 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/gl2d/2Dplus3D/Makefile b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile index 607cbbe95f..21e0dd0c30 100644 --- a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile +++ b/packages/libndsfpc/examples/gl2d/2Dplus3D/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+=2Dplus3D endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=2Dplus3D -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=2Dplus3D endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=2Dplus3D endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=2Dplus3D -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=2Dplus3D endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=2Dplus3D endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=2Dplus3D endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=2Dplus3D 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/gl2d/Makefile b/packages/libndsfpc/examples/gl2d/Makefile index 61978f0145..14b4c2c70e 100644 --- a/packages/libndsfpc/examples/gl2d/Makefile +++ b/packages/libndsfpc/examples/gl2d/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+=2Dplus3D dual_screen fonts primitives scrolling sprites endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=2Dplus3D dual_screen fonts primitives scrolling sprites 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 @@ -2724,14 +2700,6 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_2DPLUS3D=1 -TARGET_DIRS_DUAL_SCREEN=1 -TARGET_DIRS_FONTS=1 -TARGET_DIRS_PRIMITIVES=1 -TARGET_DIRS_SCROLLING=1 -TARGET_DIRS_SPRITES=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 @@ -2852,14 +2820,6 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_2DPLUS3D=1 -TARGET_DIRS_DUAL_SCREEN=1 -TARGET_DIRS_FONTS=1 -TARGET_DIRS_PRIMITIVES=1 -TARGET_DIRS_SCROLLING=1 -TARGET_DIRS_SPRITES=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 @@ -2884,7 +2844,7 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 TARGET_DIRS_FONTS=1 @@ -2892,7 +2852,7 @@ TARGET_DIRS_PRIMITIVES=1 TARGET_DIRS_SCROLLING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_2DPLUS3D=1 TARGET_DIRS_DUAL_SCREEN=1 TARGET_DIRS_FONTS=1 diff --git a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile index 678a6a93b1..4c9a713162 100644 --- a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile +++ b/packages/libndsfpc/examples/gl2d/dual_screen/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+=dual_screen endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=dual_screen -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=dual_screen endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=dual_screen endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=dual_screen -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=dual_screen endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=dual_screen endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=dual_screen endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=dual_screen 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/gl2d/fonts/Makefile b/packages/libndsfpc/examples/gl2d/fonts/Makefile index 15ae03dd24..a22178f0e7 100644 --- a/packages/libndsfpc/examples/gl2d/fonts/Makefile +++ b/packages/libndsfpc/examples/gl2d/fonts/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+=fonts endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=fonts -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=fonts endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=fonts endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=fonts -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=fonts endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=fonts endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=fonts endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=fonts 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/gl2d/primitives/Makefile b/packages/libndsfpc/examples/gl2d/primitives/Makefile index 192d382c8e..3771f5d10d 100644 --- a/packages/libndsfpc/examples/gl2d/primitives/Makefile +++ b/packages/libndsfpc/examples/gl2d/primitives/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+=primitives endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=primitives -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=primitives endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=primitives endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=primitives -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=primitives endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=primitives endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=primitives endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=primitives 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/gl2d/scrolling/Makefile b/packages/libndsfpc/examples/gl2d/scrolling/Makefile index c92e724c5f..6706bee534 100644 --- a/packages/libndsfpc/examples/gl2d/scrolling/Makefile +++ b/packages/libndsfpc/examples/gl2d/scrolling/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+=scrolling endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=scrolling -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=scrolling endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=scrolling endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=scrolling -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=scrolling endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=scrolling endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=scrolling endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=scrolling 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/gl2d/sprites/Makefile b/packages/libndsfpc/examples/gl2d/sprites/Makefile index 26640088d5..acc3c814f8 100644 --- a/packages/libndsfpc/examples/gl2d/sprites/Makefile +++ b/packages/libndsfpc/examples/gl2d/sprites/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+=sprites endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=sprites -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=sprites endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=sprites endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=sprites -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=sprites endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=sprites endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=sprites endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=sprites 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/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)))) diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile index 339a6c369d..b91d5d4da0 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/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+=16bitColorBmp endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=16bitColorBmp -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=16bitColorBmp endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=16bitColorBmp endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=16bitColorBmp -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=16bitColorBmp endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=16bitColorBmp endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=16bitColorBmp endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=16bitColorBmp 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/Backgrounds/256_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile index b8ef6b06e4..22e59b2fca 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/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+=256ColorBmp endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=256ColorBmp -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=256ColorBmp endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=256ColorBmp endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=256ColorBmp -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=256ColorBmp endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=256ColorBmp endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=256ColorBmp endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=256ColorBmp 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/Backgrounds/Double_Buffer/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile index ea0768aea1..3b6987c3ee 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/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+=DoubleBuffer endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=DoubleBuffer -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=DoubleBuffer endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=DoubleBuffer endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=DoubleBuffer -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=DoubleBuffer endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=DoubleBuffer endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=DoubleBuffer endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=DoubleBuffer 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/Backgrounds/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Makefile index 69a56ca1e3..75eb7bb63d 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/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+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=16bit_color_bmp 256_color_bmp all_in_one Double_Buffer rotation 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 @@ -2715,13 +2691,6 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_16BIT_COLOR_BMP=1 -TARGET_DIRS_256_COLOR_BMP=1 -TARGET_DIRS_ALL_IN_ONE=1 -TARGET_DIRS_DOUBLE_BUFFER=1 -TARGET_DIRS_ROTATION=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 @@ -2827,13 +2796,6 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_16BIT_COLOR_BMP=1 -TARGET_DIRS_256_COLOR_BMP=1 -TARGET_DIRS_ALL_IN_ONE=1 -TARGET_DIRS_DOUBLE_BUFFER=1 -TARGET_DIRS_ROTATION=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 @@ -2855,14 +2817,14 @@ TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 TARGET_DIRS_ALL_IN_ONE=1 TARGET_DIRS_DOUBLE_BUFFER=1 TARGET_DIRS_ROTATION=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_16BIT_COLOR_BMP=1 TARGET_DIRS_256_COLOR_BMP=1 TARGET_DIRS_ALL_IN_ONE=1 diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile index f7b227627a..790a33376a 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/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 @@ -371,9 +371,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) override TARGET_PROGRAMS+=BackgroundAllInOne endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=BackgroundAllInOne -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=BackgroundAllInOne endif @@ -419,9 +416,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BackgroundAllInOne endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=BackgroundAllInOne -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=BackgroundAllInOne endif @@ -431,10 +425,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=BackgroundAllInOne endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=BackgroundAllInOne endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=BackgroundAllInOne endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -629,9 +623,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 @@ -677,9 +668,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 @@ -689,10 +677,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) @@ -887,9 +875,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 @@ -935,9 +920,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 @@ -947,10 +929,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) @@ -1146,9 +1128,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 @@ -1194,9 +1173,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 @@ -1206,10 +1182,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) @@ -1404,9 +1380,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 @@ -1452,9 +1425,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 @@ -1464,10 +1434,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) @@ -1662,9 +1632,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 @@ -1710,9 +1677,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 @@ -1722,10 +1686,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) @@ -2639,15 +2603,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 @@ -2783,15 +2738,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 @@ -2819,7 +2765,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 @@ -2828,7 +2774,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 @@ -3868,7 +3814,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/Backgrounds/rotation/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile index 360514aafb..7e06bfb0db 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/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+=Rotation endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=Rotation -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=Rotation endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Rotation endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=Rotation -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=Rotation endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=Rotation endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=Rotation endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=Rotation 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/Effects/Makefile b/packages/libndsfpc/examples/graphics/Effects/Makefile index 29e620aae1..90ac292578 100644 --- a/packages/libndsfpc/examples/graphics/Effects/Makefile +++ b/packages/libndsfpc/examples/graphics/Effects/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+=windows endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=windows -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=windows endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=windows endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=windows -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=windows endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=windows endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=windows endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=windows 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_WINDOWS=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_WINDOWS=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_WINDOWS=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_WINDOWS=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_WINDOWS=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_WINDOWS=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_WINDOWS=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_WINDOWS=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_WINDOWS=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile b/packages/libndsfpc/examples/graphics/Effects/windows/Makefile index 08fbbfcf06..69b9dadd81 100644 --- a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile +++ b/packages/libndsfpc/examples/graphics/Effects/windows/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+=windows endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=windows -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=windows endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=windows endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=windows -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=windows endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=windows endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=windows endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=windows 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/Ext_Palettes/Makefile b/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile index a233c11070..ab186530ed 100644 --- a/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile +++ b/packages/libndsfpc/examples/graphics/Ext_Palettes/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+=backgrounds endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=backgrounds -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=backgrounds endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=backgrounds -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=backgrounds endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=backgrounds 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 @@ -2679,9 +2655,6 @@ endif ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_BACKGROUNDS=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_BACKGROUNDS=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_BACKGROUNDS=1 endif @@ -2727,9 +2700,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_BACKGROUNDS=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_BACKGROUNDS=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_BACKGROUNDS=1 endif @@ -2739,10 +2709,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_BACKGROUNDS=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_BACKGROUNDS=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_BACKGROUNDS=1 endif ifeq ($(FULL_TARGET),m68k-embedded) diff --git a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile index 874a87153b..7bd120fa78 100644 --- a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile +++ b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/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+=backgrounds endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=backgrounds -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=backgrounds endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=backgrounds -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=backgrounds endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=backgrounds endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=backgrounds 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/Makefile b/packages/libndsfpc/examples/graphics/Makefile index 0c735adcc6..591bc33671 100644 --- a/packages/libndsfpc/examples/graphics/Makefile +++ b/packages/libndsfpc/examples/graphics/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 Backgrounds Effects Ext_Palettes Printing Sprites endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=3D Backgrounds Effects Ext_Palettes Printing Sprites 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 @@ -2724,14 +2700,6 @@ TARGET_DIRS_EXT_PALETTES=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_3D=1 -TARGET_DIRS_BACKGROUNDS=1 -TARGET_DIRS_EFFECTS=1 -TARGET_DIRS_EXT_PALETTES=1 -TARGET_DIRS_PRINTING=1 -TARGET_DIRS_SPRITES=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 @@ -2852,14 +2820,6 @@ TARGET_DIRS_EXT_PALETTES=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_3D=1 -TARGET_DIRS_BACKGROUNDS=1 -TARGET_DIRS_EFFECTS=1 -TARGET_DIRS_EXT_PALETTES=1 -TARGET_DIRS_PRINTING=1 -TARGET_DIRS_SPRITES=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 @@ -2884,7 +2844,7 @@ TARGET_DIRS_EXT_PALETTES=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 TARGET_DIRS_EFFECTS=1 @@ -2892,7 +2852,7 @@ TARGET_DIRS_EXT_PALETTES=1 TARGET_DIRS_PRINTING=1 TARGET_DIRS_SPRITES=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_3D=1 TARGET_DIRS_BACKGROUNDS=1 TARGET_DIRS_EFFECTS=1 diff --git a/packages/libndsfpc/examples/graphics/Printing/Makefile b/packages/libndsfpc/examples/graphics/Printing/Makefile index 4eb5d548ff..5902d5bb6c 100644 --- a/packages/libndsfpc/examples/graphics/Printing/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/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+=ansi_console console_windows custom_font print_both_screens rotscale_text endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=ansi_console console_windows custom_font print_both_screens rotscale_text 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 @@ -2715,13 +2691,6 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_ANSI_CONSOLE=1 -TARGET_DIRS_CONSOLE_WINDOWS=1 -TARGET_DIRS_CUSTOM_FONT=1 -TARGET_DIRS_PRINT_BOTH_SCREENS=1 -TARGET_DIRS_ROTSCALE_TEXT=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 @@ -2827,13 +2796,6 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_ANSI_CONSOLE=1 -TARGET_DIRS_CONSOLE_WINDOWS=1 -TARGET_DIRS_CUSTOM_FONT=1 -TARGET_DIRS_PRINT_BOTH_SCREENS=1 -TARGET_DIRS_ROTSCALE_TEXT=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 @@ -2855,14 +2817,14 @@ TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 TARGET_DIRS_CUSTOM_FONT=1 TARGET_DIRS_PRINT_BOTH_SCREENS=1 TARGET_DIRS_ROTSCALE_TEXT=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_ANSI_CONSOLE=1 TARGET_DIRS_CONSOLE_WINDOWS=1 TARGET_DIRS_CUSTOM_FONT=1 diff --git a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile index 250ab03bd4..25ff56ccad 100644 --- a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/ansi_console/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+=AnsiConsole endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=AnsiConsole -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=AnsiConsole endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AnsiConsole endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=AnsiConsole -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=AnsiConsole endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=AnsiConsole endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=AnsiConsole endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=AnsiConsole 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/Printing/console_windows/Makefile b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile index 4299a60827..2bdaca209b 100644 --- a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/console_windows/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+=ConsoleWindows endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=ConsoleWindows -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=ConsoleWindows endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=ConsoleWindows endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=ConsoleWindows -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=ConsoleWindows endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=ConsoleWindows endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=ConsoleWindows endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=ConsoleWindows 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/Printing/custom_font/Makefile b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile index 92d3b6314e..d36235be28 100644 --- a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/custom_font/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+=CustomFont endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=CustomFont -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=CustomFont endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=CustomFont endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=CustomFont -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=CustomFont endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=CustomFont endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=CustomFont endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=CustomFont 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/Printing/print_both_screens/Makefile b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile index fd29b245fd..f3ee39b5b8 100644 --- a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/print_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+=printBothScreens endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=printBothScreens -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=printBothScreens endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=printBothScreens endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=printBothScreens -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=printBothScreens endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=printBothScreens endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=printBothScreens endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=printBothScreens 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/Printing/rotscale_text/Makefile b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile index d75fad462a..d359510f08 100644 --- a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/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+=RotscaleText endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=RotscaleText -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=RotscaleText endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=RotscaleText endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=RotscaleText -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=RotscaleText endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=RotscaleText endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=RotscaleText endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=RotscaleText 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/Sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/Makefile index e3c272383a..934addbc04 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/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+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=allocation_test animate_simple bitmap_sprites fire_and_sprites simple sprite_extended_palettes sprite_rotate 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 @@ -2733,15 +2709,6 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_ALLOCATION_TEST=1 -TARGET_DIRS_ANIMATE_SIMPLE=1 -TARGET_DIRS_BITMAP_SPRITES=1 -TARGET_DIRS_FIRE_AND_SPRITES=1 -TARGET_DIRS_SIMPLE=1 -TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 -TARGET_DIRS_SPRITE_ROTATE=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 @@ -2877,15 +2844,6 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_ALLOCATION_TEST=1 -TARGET_DIRS_ANIMATE_SIMPLE=1 -TARGET_DIRS_BITMAP_SPRITES=1 -TARGET_DIRS_FIRE_AND_SPRITES=1 -TARGET_DIRS_SIMPLE=1 -TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 -TARGET_DIRS_SPRITE_ROTATE=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 @@ -2913,7 +2871,7 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 TARGET_DIRS_BITMAP_SPRITES=1 @@ -2922,7 +2880,7 @@ TARGET_DIRS_SIMPLE=1 TARGET_DIRS_SPRITE_EXTENDED_PALETTES=1 TARGET_DIRS_SPRITE_ROTATE=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_ALLOCATION_TEST=1 TARGET_DIRS_ANIMATE_SIMPLE=1 TARGET_DIRS_BITMAP_SPRITES=1 diff --git a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile index 2364ccbee9..7d15704a02 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/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+=AllocationTest endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=AllocationTest -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=AllocationTest endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AllocationTest endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=AllocationTest -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=AllocationTest endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=AllocationTest endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=AllocationTest endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=AllocationTest 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/Sprites/animate_simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile index d13be4c09c..1716756ae6 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/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+=AnimateSimple endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=AnimateSimple -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=AnimateSimple endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=AnimateSimple endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=AnimateSimple -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=AnimateSimple endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=AnimateSimple endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=AnimateSimple endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=AnimateSimple 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/Sprites/bitmap_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile index a3519f303a..01941f2767 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/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+=BitmapSprites endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=BitmapSprites -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=BitmapSprites endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=BitmapSprites endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=BitmapSprites -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=BitmapSprites endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=BitmapSprites endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=BitmapSprites endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=BitmapSprites 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/Sprites/fire_and_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile index 994dc3ef23..df070f9944 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/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+=FireAndSprites endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=FireAndSprites -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=FireAndSprites endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=FireAndSprites endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=FireAndSprites -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=FireAndSprites endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=FireAndSprites endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=FireAndSprites endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=FireAndSprites 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/Sprites/simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile index fb5f505c7b..0680a97b5a 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/simple/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+=Simple endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=Simple -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=Simple endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=Simple endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=Simple -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=Simple endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=Simple endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=Simple endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=Simple 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/Sprites/sprite_extended_palettes/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile index 528396da7d..7e42b76977 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/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+=SpriteExtendedPalettes endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=SpriteExtendedPalettes -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=SpriteExtendedPalettes -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=SpriteExtendedPalettes endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=SpriteExtendedPalettes 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/Sprites/sprite_rotate/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile index a54efaf389..ea75918c7c 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/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+=SpriteRotate endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=SpriteRotate -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=SpriteRotate endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=SpriteRotate endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=SpriteRotate -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=SpriteRotate endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=SpriteRotate endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=SpriteRotate endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=SpriteRotate 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/hello_world/Makefile b/packages/libndsfpc/examples/hello_world/Makefile index 8b31e8de9f..f9a921a18d 100644 --- a/packages/libndsfpc/examples/hello_world/Makefile +++ b/packages/libndsfpc/examples/hello_world/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+=helloWorld endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=helloWorld -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=helloWorld endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=helloWorld endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=helloWorld -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=helloWorld endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=helloWorld endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=helloWorld endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=helloWorld 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/input/Makefile b/packages/libndsfpc/examples/input/Makefile index 9383f8df5a..8f66c7146c 100644 --- a/packages/libndsfpc/examples/input/Makefile +++ b/packages/libndsfpc/examples/input/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+=keyboard Touch_Pad endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=keyboard Touch_Pad -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=keyboard Touch_Pad endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=keyboard Touch_Pad endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=keyboard Touch_Pad -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=keyboard Touch_Pad endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=keyboard Touch_Pad endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=keyboard Touch_Pad endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=keyboard Touch_Pad 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 @@ -2688,10 +2664,6 @@ ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_KEYBOARD=1 -TARGET_DIRS_TOUCH_PAD=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 @@ -2752,10 +2724,6 @@ ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_KEYBOARD=1 -TARGET_DIRS_TOUCH_PAD=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 @@ -2768,11 +2736,11 @@ ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_KEYBOARD=1 TARGET_DIRS_TOUCH_PAD=1 endif diff --git a/packages/libndsfpc/examples/input/Touch_Pad/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/Makefile index ff70e25899..9271cb25cc 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/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+=touch_area touch_look touch_test endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=touch_area touch_look touch_test -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=touch_area touch_look touch_test endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=touch_area touch_look touch_test endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=touch_area touch_look touch_test -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=touch_area touch_look touch_test endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=touch_area touch_look touch_test endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=touch_area touch_look touch_test endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=touch_area touch_look touch_test 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 @@ -2697,11 +2673,6 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_TOUCH_AREA=1 -TARGET_DIRS_TOUCH_LOOK=1 -TARGET_DIRS_TOUCH_TEST=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 @@ -2777,11 +2748,6 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_TOUCH_AREA=1 -TARGET_DIRS_TOUCH_LOOK=1 -TARGET_DIRS_TOUCH_TEST=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 @@ -2797,12 +2763,12 @@ TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_TOUCH_AREA=1 TARGET_DIRS_TOUCH_LOOK=1 TARGET_DIRS_TOUCH_TEST=1 diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile index 174b8278d8..cfc7bd41f5 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/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+=touchArea endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=touchArea -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=touchArea endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchArea endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=touchArea -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=touchArea endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=touchArea endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=touchArea endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=touchArea 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/input/Touch_Pad/touch_look/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile index 07aeb8152e..39e0f5f48f 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/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+=touchLook endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=touchLook -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=touchLook endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchLook endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=touchLook -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=touchLook endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=touchLook endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=touchLook endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=touchLook 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/input/Touch_Pad/touch_test/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile index 9006a1f0c9..0bb950aa1e 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/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+=touchTest endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=touchTest -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=touchTest endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=touchTest endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=touchTest -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=touchTest endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=touchTest endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=touchTest endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=touchTest 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/input/keyboard/Makefile b/packages/libndsfpc/examples/input/keyboard/Makefile index 2f9c5bffb8..e11bf07e1d 100644 --- a/packages/libndsfpc/examples/input/keyboard/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/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+=keyboard_async keyboard_stdin endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=keyboard_async keyboard_stdin -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=keyboard_async keyboard_stdin endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=keyboard_async keyboard_stdin endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=keyboard_async keyboard_stdin -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=keyboard_async keyboard_stdin endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=keyboard_async keyboard_stdin endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=keyboard_async keyboard_stdin endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=keyboard_async keyboard_stdin 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 @@ -2688,10 +2664,6 @@ ifeq ($(FULL_TARGET),i386-solaris) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_KEYBOARD_ASYNC=1 -TARGET_DIRS_KEYBOARD_STDIN=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 @@ -2752,10 +2724,6 @@ ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_KEYBOARD_ASYNC=1 -TARGET_DIRS_KEYBOARD_STDIN=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 @@ -2768,11 +2736,11 @@ ifeq ($(FULL_TARGET),m68k-atari) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_KEYBOARD_ASYNC=1 TARGET_DIRS_KEYBOARD_STDIN=1 endif diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile index 9c334d0642..280eabedfb 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_async/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+=keyboardAsync endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=keyboardAsync -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=keyboardAsync endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=keyboardAsync endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=keyboardAsync -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=keyboardAsync endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=keyboardAsync endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=keyboardAsync endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=keyboardAsync 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/input/keyboard/keyboard_stdin/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile index db715ffcff..df56c34656 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/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+=keyboardStdin endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=keyboardStdin -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=keyboardStdin endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=keyboardStdin endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=keyboardStdin -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=keyboardStdin endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=keyboardStdin endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=keyboardStdin endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=keyboardStdin 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/time/Makefile b/packages/libndsfpc/examples/time/Makefile index 373f6a0602..55d2e34d4c 100644 --- a/packages/libndsfpc/examples/time/Makefile +++ b/packages/libndsfpc/examples/time/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+=RealTimeClock timercallback stopwatch endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=RealTimeClock timercallback stopwatch -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif @@ -406,9 +403,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=RealTimeClock timercallback stopwatch -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif @@ -418,10 +412,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_DIRS+=RealTimeClock timercallback stopwatch endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_DIRS+=RealTimeClock timercallback stopwatch 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 @@ -2697,11 +2673,6 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_REALTIMECLOCK=1 -TARGET_DIRS_TIMERCALLBACK=1 -TARGET_DIRS_STOPWATCH=1 -endif ifeq ($(FULL_TARGET),i386-netware) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 @@ -2777,11 +2748,6 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_REALTIMECLOCK=1 -TARGET_DIRS_TIMERCALLBACK=1 -TARGET_DIRS_STOPWATCH=1 -endif ifeq ($(FULL_TARGET),m68k-netbsd) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 @@ -2797,12 +2763,12 @@ TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) TARGET_DIRS_REALTIMECLOCK=1 TARGET_DIRS_TIMERCALLBACK=1 TARGET_DIRS_STOPWATCH=1 diff --git a/packages/libndsfpc/examples/time/RealTimeClock/Makefile b/packages/libndsfpc/examples/time/RealTimeClock/Makefile index 353da8fe6c..daacad8374 100644 --- a/packages/libndsfpc/examples/time/RealTimeClock/Makefile +++ b/packages/libndsfpc/examples/time/RealTimeClock/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+=RealTimeClock endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=RealTimeClock -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=RealTimeClock endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=RealTimeClock endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=RealTimeClock -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=RealTimeClock endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=RealTimeClock endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=RealTimeClock endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=RealTimeClock 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/time/stopwatch/Makefile b/packages/libndsfpc/examples/time/stopwatch/Makefile index 4f380f6bc3..a02ea65c4b 100644 --- a/packages/libndsfpc/examples/time/stopwatch/Makefile +++ b/packages/libndsfpc/examples/time/stopwatch/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+=stopwatch endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=stopwatch -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=stopwatch endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=stopwatch endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=stopwatch -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=stopwatch endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=stopwatch endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=stopwatch endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=stopwatch 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/time/timercallback/Makefile b/packages/libndsfpc/examples/time/timercallback/Makefile index 2665528962..9c865f2b06 100644 --- a/packages/libndsfpc/examples/time/timercallback/Makefile +++ b/packages/libndsfpc/examples/time/timercallback/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+=timercallback endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=timercallback -endif ifeq ($(FULL_TARGET),i386-netware) override TARGET_PROGRAMS+=timercallback endif @@ -418,9 +415,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=timercallback endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=timercallback -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_PROGRAMS+=timercallback endif @@ -430,10 +424,10 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_PROGRAMS+=timercallback endif -ifeq ($(FULL_TARGET),m68k-openbsd) +ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_PROGRAMS+=timercallback endif -ifeq ($(FULL_TARGET),m68k-palmos) +ifeq ($(FULL_TARGET),m68k-macos) override TARGET_PROGRAMS+=timercallback 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)))) |