diff options
Diffstat (limited to 'packages/libndsfpc/examples/audio/maxmod')
10 files changed, 1348 insertions, 117 deletions
diff --git a/packages/libndsfpc/examples/audio/maxmod/Makefile b/packages/libndsfpc/examples/audio/maxmod/Makefile index b6f19ed92b..398f719fb1 100644 --- a/packages/libndsfpc/examples/audio/maxmod/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -184,6 +184,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -388,6 +394,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -475,6 +484,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -529,6 +541,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_DIRS+=audio_modes basic_sound reverb song_events_example song_events_example2 endif @@ -784,6 +799,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -829,6 +850,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -1388,6 +1414,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1649,6 +1684,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1811,6 +1855,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2226,7 +2279,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2256,17 +2309,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) @@ -2616,6 +2675,13 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),i386-aros) +TARGET_DIRS_AUDIO_MODES=1 +TARGET_DIRS_BASIC_SOUND=1 +TARGET_DIRS_REVERB=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 +TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2819,6 +2885,13 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +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),arm-linux) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 @@ -2945,6 +3018,13 @@ TARGET_DIRS_REVERB=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE=1 TARGET_DIRS_SONG_EVENTS_EXAMPLE2=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +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),mipsel-android) TARGET_DIRS_AUDIO_MODES=1 TARGET_DIRS_BASIC_SOUND=1 diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile index ffe2296f9e..5518068b40 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -186,6 +186,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -393,6 +399,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=audio_modes endif @@ -480,6 +489,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=audio_modes endif @@ -534,6 +546,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=audio_modes endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_PROGRAMS+=audio_modes +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_PROGRAMS+=audio_modes endif @@ -615,6 +630,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -702,6 +720,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -756,6 +777,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -837,6 +861,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -924,6 +951,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=* endif @@ -978,6 +1008,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_UNITS+=* endif @@ -1059,6 +1092,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1146,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1200,6 +1239,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1213,6 +1255,237 @@ ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i8086-msdos) +override COMPILER_OPTIONS+=-Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1455,6 +1728,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1500,6 +1779,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2059,6 +2343,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2320,6 +2613,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2482,6 +2784,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2897,7 +3208,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2927,17 +3238,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc index 4f0a0c535c..b52520b62b 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc @@ -14,6 +14,10 @@ nortl=y [install] fpcpackage=y +[compiler] +options=-Xm + + [default] cpu=arm target=nds diff --git a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile index 6d5f3e2eec..d67081c14c 100644 --- a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -186,6 +186,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -393,6 +399,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=basic_sound endif @@ -480,6 +489,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=basic_sound endif @@ -534,6 +546,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=basic_sound endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_PROGRAMS+=basic_sound +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_PROGRAMS+=basic_sound endif @@ -615,6 +630,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -702,6 +720,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -756,6 +777,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -837,6 +861,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -924,6 +951,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=* endif @@ -978,6 +1008,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_UNITS+=* endif @@ -1059,6 +1092,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1146,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1200,6 +1239,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1282,6 +1324,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_OPTIONS+=-g -O2 +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-g -O2 endif @@ -1369,6 +1414,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_OPTIONS+=-g -O2 +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_OPTIONS+=-g -O2 endif @@ -1423,6 +1471,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_OPTIONS+=-g -O2 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override COMPILER_OPTIONS+=-g -O2 +endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_OPTIONS+=-g -O2 endif @@ -1677,6 +1728,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1722,6 +1779,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2281,6 +2343,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2542,6 +2613,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2704,6 +2784,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3119,7 +3208,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3149,17 +3238,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders diff --git a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile index 382992a6d0..fdc0dd0afa 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -186,6 +186,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -393,6 +399,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=reverb endif @@ -480,6 +489,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=reverb endif @@ -534,6 +546,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=reverb endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_PROGRAMS+=reverb +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_PROGRAMS+=reverb endif @@ -615,6 +630,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -702,6 +720,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -756,6 +777,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_LOADERS+=soundbank.bin $(GFX_FILES) endif @@ -837,6 +861,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -924,6 +951,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=* endif @@ -978,6 +1008,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_UNITS+=* endif @@ -1059,6 +1092,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1146,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1200,6 +1239,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1213,6 +1255,237 @@ ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i8086-msdos) +override COMPILER_OPTIONS+=-Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1455,6 +1728,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1500,6 +1779,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2059,6 +2343,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2320,6 +2613,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2482,6 +2784,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2897,7 +3208,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2927,17 +3238,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders diff --git a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc index 64c636363a..d83c47ac67 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc @@ -14,6 +14,9 @@ nortl=y [install] fpcpackage=y +[compiler] +options=-Xm + [default] cpu=arm target=nds diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile index 68f492c495..75d90ab5f7 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -186,6 +186,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -395,6 +401,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example endif @@ -482,6 +491,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=song_events_example endif @@ -536,6 +548,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=song_events_example endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_PROGRAMS+=song_events_example +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_PROGRAMS+=song_events_example endif @@ -617,6 +632,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin endif @@ -704,6 +722,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=mmsolution.bin endif @@ -758,6 +779,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=mmsolution.bin endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_LOADERS+=mmsolution.bin +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_LOADERS+=mmsolution.bin endif @@ -839,6 +863,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -926,6 +953,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=* endif @@ -980,6 +1010,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_UNITS+=* endif @@ -1061,6 +1094,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1148,6 +1184,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1202,6 +1241,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC)/* endif @@ -1216,226 +1258,235 @@ override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin *.map $(BUILD)/* $(INC endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i386-android) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),arm-android) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),mipsel-android) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_OPTIONS+=-g -Xm +override COMPILER_OPTIONS+=-Xm endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1679,6 +1730,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1724,6 +1781,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2283,6 +2345,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2544,6 +2615,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2706,6 +2786,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -3121,7 +3210,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -3151,17 +3240,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc index 8838c21291..3d8c26257e 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc @@ -20,7 +20,7 @@ target=nds fpcdir=../../../../../.. [compiler] -options=-g -Xm +options=-Xm #-d__THUMB__ [clean] diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile index 2bacee8100..5e837da4d7 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-02-06 rev 26692] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -186,6 +186,12 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -393,6 +399,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=song_events_example2 endif @@ -480,6 +489,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_PROGRAMS+=song_events_example2 endif @@ -534,6 +546,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=song_events_example2 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_PROGRAMS+=song_events_example2 +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_PROGRAMS+=song_events_example2 endif @@ -615,6 +630,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -702,6 +720,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -756,6 +777,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) +endif ifeq ($(FULL_TARGET),mipsel-android) override TARGET_LOADERS+=mmsolution.bin $(GFX_FILES) endif @@ -837,6 +861,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=* endif @@ -924,6 +951,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_UNITS+=* endif @@ -978,6 +1008,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_UNITS+=* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_UNITS+=* endif @@ -1059,6 +1092,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),i386-aros) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1146,6 +1182,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1200,6 +1239,9 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* +endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif @@ -1213,6 +1255,237 @@ ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_FILES+=*.elf *.o *.s *.nds *.nef *.h *.bin $(BUILD)/* endif override INSTALL_FPCPACKAGE=y +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-haiku) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-nativent) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-iphonesim) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_OPTIONS+=-Xm +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 +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-netbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-solaris) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-openbsd) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),arm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),powerpc64-aix) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),avr-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mips-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-linux) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-embedded) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),mipsel-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-java) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),jvm-android) +override COMPILER_OPTIONS+=-Xm +endif +ifeq ($(FULL_TARGET),i8086-msdos) +override COMPILER_OPTIONS+=-Xm +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1455,6 +1728,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1500,6 +1779,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2059,6 +2343,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),i386-aros) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2320,6 +2613,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2482,6 +2784,15 @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_LIBNDSFPC=1 endif +ifeq ($(FULL_TARGET),mipsel-embedded) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_LIBNDSFPC=1 +endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2897,7 +3208,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2927,17 +3238,23 @@ ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifeq (,$(findstring -s ,$(COMPILER))) +ifneq (,$(findstring -sh ,$(COMPILER))) +UseEXECPPAS=1 +endif +ifneq (,$(findstring -s ,$(COMPILER))) +ifeq ($(FULL_SOURCE),$(FULL_TARGET)) +UseEXECPPAS=1 +endif +endif +ifneq ($(UseEXECPPAS),1) EXECPPAS= else -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifdef RUNBATCH EXECPPAS:=@$(RUNBATCH) $(PPAS) else EXECPPAS:=@$(PPAS) endif endif -endif .PHONY: fpc_loaders ifneq ($(TARGET_LOADERS),) override ALLTARGET+=fpc_loaders diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc index 03301b13e0..c3e9358aa8 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc @@ -14,6 +14,9 @@ nortl=y [install] fpcpackage=y +[compiler] +options=-Xm + [default] cpu=arm target=nds |