diff options
82 files changed, 191 insertions, 472 deletions
diff --git a/packages/libgbafpc/Makefile.fpc.fpcmake b/packages/libgbafpc/Makefile.fpc.fpcmake index 1b2157c42b..f28a2b303c 100644 --- a/packages/libgbafpc/Makefile.fpc.fpcmake +++ b/packages/libgbafpc/Makefile.fpc.fpcmake @@ -18,7 +18,7 @@ includedir=src src/maxmod sourcedir=src tests [prerules] -BINUTILSPREFIX=arm-eabi- +BINUTILSPREFIX=arm-none-eabi- [install] fpcpackage=y diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc index 559f6631bc..abf3a3e2e3 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc @@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc index 44da81c4df..20acedd9af 100644 --- a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc @@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc index 4463668b92..3f97ac1745 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc @@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc 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 f8f7fb4b4c..d2deb95e9c 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc @@ -87,7 +87,7 @@ mmsolution.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc 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 831d1f8b22..98077b3ecd 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc @@ -87,7 +87,7 @@ mmsolution.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc b/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc index c1968335bd..a197a1e77c 100644 --- a/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/audio/micrecord/Makefile.fpc b/packages/libndsfpc/examples/audio/micrecord/Makefile.fpc index 13f84cb05d..99b34380bb 100644 --- a/packages/libndsfpc/examples/audio/micrecord/Makefile.fpc +++ b/packages/libndsfpc/examples/audio/micrecord/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/card/eeprom/Makefile.fpc b/packages/libndsfpc/examples/card/eeprom/Makefile.fpc index 7396ad78de..fe400ba596 100644 --- a/packages/libndsfpc/examples/card/eeprom/Makefile.fpc +++ b/packages/libndsfpc/examples/card/eeprom/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc index 906cfb792c..9a3b0b5cba 100644 --- a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc +++ b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/ds_motion/Makefile.fpc b/packages/libndsfpc/examples/ds_motion/Makefile.fpc index 4839df3ace..64efbf38be 100644 --- a/packages/libndsfpc/examples/ds_motion/Makefile.fpc +++ b/packages/libndsfpc/examples/ds_motion/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc b/packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc index 0b61aeb853..e824c1aaab 100644 --- a/packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc +++ b/packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc index ffd7909ff8..689647c46e 100644 --- a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc +++ b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc b/packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc index 99ed801004..cf9e1bf162 100644 --- a/packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc +++ b/packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc @@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc index 199aae192b..ce8d3e4a08 100644 --- a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc +++ b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc @@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc index 74b0762d2d..df0e51cd12 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc +++ b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc @@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc index 721b275f46..34cead46ca 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc +++ b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc @@ -84,7 +84,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc index f50c1b2903..749ba80b1a 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc +++ b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc @@ -84,7 +84,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc index c5eee35cca..adbe395346 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc +++ b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MOVE) /Y $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc index d8679475a7..32e38658aa 100644 --- a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc @@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc index 4486b343a8..9844b471d4 100644 --- a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc @@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc b/packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc index 537f27bb33..6a44338d52 100644 --- a/packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc b/packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc index 941ccaba5d..2a30df4d76 100644 --- a/packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc b/packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc index 9c2b75b30e..10934ce246 100644 --- a/packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc b/packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc index 6f27ef46b1..7477c8dc40 100644 --- a/packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc +++ b/packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc index cfaf0db31e..f9873827c7 100644 --- a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc index 8958a391b4..c7b15e86a3 100644 --- a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc index 5854e1c08d..7cc2e91c99 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc index 843e3f88e9..694c4412db 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc index 96cb6a7b35..97ca6d1f8b 100644 --- a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc index dfca6fea40..b3b7ceb9b0 100644 --- a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc index 914f5a96d7..927aeac39b 100644 --- a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc index 76e2a67bd6..0d2e51d2df 100644 --- a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc index f4e26fd894..85e83a0c52 100644 --- a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc index de9216c080..d16a98a8e0 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc index c0fdf6eb8b..e91ae9429b 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc index 252fbbad7a..ab576ff2eb 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc index 92ff5964d6..a77b79fe4f 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc index 2f4ebf8a05..e37b1d85be 100644 --- a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc index 53623c43b4..3553ff29d8 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc index cfb0bf9176..fe40746bd6 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc index 40b8f3812e..f13a015138 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc index 423eea88df..39e37fe9e8 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc index df8c96413b..fea37db78e 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc index f773f5ef55..f83ef18759 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc index 45046b581c..5863271ffe 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc index b4255910b6..2b76279296 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc index b8b83f1f6d..7e89167a8b 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc index 54b99bb01f..ba94dbf079 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc index a02dea5d08..246b7ac495 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc index 3cdc76498e..6ba964c178 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc index 1320e1a210..ee4179dd41 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc @@ -88,7 +88,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc index a9d39f6ac6..daaf667957 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc index 6e8b42b580..0fe7ac3068 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc index 662e08c159..25088eed34 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc index d3453fd049..bde72d4142 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc b/packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc index 5ee1bede6e..28ee39a4d7 100644 --- a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc index bc2f0a01bd..60df85098c 100644 --- a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc index 1d5daa46a2..de3275a8a8 100644 --- a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc index 3b505a39a3..da0305d1b1 100644 --- a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc index c201e1fed0..e4d0a0bde7 100644 --- a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc index dd1c75974e..d5d9550f37 100644 --- a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc index 216a5ea35b..803ba0a966 100644 --- a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc index 2bf78b0bcb..b27b362276 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc index c5320fe597..169d1af004 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc index a12d29e376..acecc4a4ec 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc index 2bb75d4cfd..10610d5333 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc index cdc19e4bf5..9df18a11a6 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc index 552dbe07f9..326723525f 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc index 80ddce8e14..ea4dd2fa56 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/hello_world/Makefile.fpc b/packages/libndsfpc/examples/hello_world/Makefile.fpc index b29ba792b2..4cedc6879c 100644 --- a/packages/libndsfpc/examples/hello_world/Makefile.fpc +++ b/packages/libndsfpc/examples/hello_world/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc index 84262d4699..67eaef55e3 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc index 43a700d2f7..03723fa100 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc index 5a588c9a9e..43d2008b46 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc index 290a7cc18a..9d9bf68898 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc index f0728db38e..134790da92 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc b/packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc index 2d5c1386c9..51e18be3df 100644 --- a/packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc +++ b/packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/time/stopwatch/Makefile.fpc b/packages/libndsfpc/examples/time/stopwatch/Makefile.fpc index 2792071304..384d19c8ad 100644 --- a/packages/libndsfpc/examples/time/stopwatch/Makefile.fpc +++ b/packages/libndsfpc/examples/time/stopwatch/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/packages/libndsfpc/examples/time/timercallback/Makefile.fpc b/packages/libndsfpc/examples/time/timercallback/Makefile.fpc index df6492ba26..063d05e657 100644 --- a/packages/libndsfpc/examples/time/timercallback/Makefile.fpc +++ b/packages/libndsfpc/examples/time/timercallback/Makefile.fpc @@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES) # $(GFX_FILES): $(wildcard %.bmp %.png) @echo 'Converting $(@) file to asm...' - $(GRIT) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) + $(GRIT_FPC) $(GFX)/$(@) -fp -fts -ff $(GFX)/$(basename $(@)).grit -o$(BUILD)/$(@) @echo 'Assembling $(@).s file...' $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index b415506754..19fb99f4fe 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-01-04 rev 29399] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014/10/11] # 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-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 aarch64-darwin -BSDs = freebsd netbsd openbsd darwin dragonfly -UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux +BSDs = freebsd netbsd openbsd darwin +UNIXs = linux $(BSDs) solaris qnx haiku +LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -180,18 +180,6 @@ else ARCH=$(CPU_TARGET) endif endif -ifeq ($(FULL_TARGET),arm-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif -ifeq ($(FULL_TARGET),mipsel-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -217,14 +205,6 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif -ifndef CROSSCOMPILE -BUILDFULLNATIVE=1 -export BUILDFULLNATIVE -endif -ifdef BUILDFULLNATIVE -BUILDNATIVE=1 -export BUILDNATIVE -endif export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -273,27 +253,8 @@ endif ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE -ifneq ($(OS_TARGET),msdos) ifndef DARWIN2DARWIN -ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- -ifeq ($(OS_TARGET),android) -ifeq ($(CPU_TARGET),arm) -BINUTILSPREFIX=arm-linux-androideabi- -else -ifeq ($(CPU_TARGET),i386) -BINUTILSPREFIX=i686-linux-android- -else -ifeq ($(CPU_TARGET),mipsel) -BINUTILSPREFIX=mipsel-linux-android- -endif -endif -endif -endif -endif -endif -else -BINUTILSPREFIX=$(OS_TARGET)- endif endif endif @@ -335,6 +296,8 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +LOADERS=prt0 cprt0 +override FPCOPT+=@rtl.cfg ifdef RELEASE override FPCOPT+=-Ur endif @@ -406,12 +369,6 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),i386-aros) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif @@ -460,9 +417,6 @@ endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif @@ -499,12 +453,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif @@ -529,9 +477,6 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif @@ -541,9 +486,6 @@ endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),avr-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif @@ -553,30 +495,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl endif -ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -643,12 +564,6 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),i386-aros) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -697,9 +612,6 @@ endif ifeq ($(FULL_TARGET),powerpc-wii) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -736,12 +648,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -766,9 +672,6 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -778,9 +681,6 @@ endif ifeq ($(FULL_TARGET),powerpc64-embedded) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),avr-embedded) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif @@ -790,266 +690,203 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 endif -ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 -endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),i386-android) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),i386-aros) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),arm-android) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),mips-linux) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),jvm-java) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),jvm-android) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_LOADERS+=prt0 cprt0 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_LOADERS+=prt0 cprt0 +override TARGET_LOADERS+=$(LOADERS) endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -1118,12 +955,6 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),i386-aros) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1172,9 +1003,6 @@ endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1211,12 +1039,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),x86_64-dragonfly) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1241,9 +1063,6 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1253,9 +1072,6 @@ endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),avr-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1265,30 +1081,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),mipsel-embedded) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),mipsel-android) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1355,12 +1150,6 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),i386-android) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),i386-aros) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1409,9 +1198,6 @@ endif ifeq ($(FULL_TARGET),powerpc-wii) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc-aix) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1448,12 +1234,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),x86_64-dragonfly) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1478,9 +1258,6 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),arm-android) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1490,9 +1267,6 @@ endif ifeq ($(FULL_TARGET),powerpc64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),powerpc64-aix) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),avr-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1502,30 +1276,9 @@ endif ifeq ($(FULL_TARGET),armeb-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),mips-linux) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),mipsel-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),mipsel-embedded) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),mipsel-android) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),jvm-java) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),jvm-android) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),i8086-msdos) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1754,26 +1507,12 @@ SHAREDLIBEXT=.dll SHORTSUFFIX=wat IMPORTLIBPREFIX= endif -ifneq ($(CPU_TARGET),jvm) -ifeq ($(OS_TARGET),android) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -endif ifeq ($(OS_TARGET),linux) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif -ifeq ($(OS_TARGET),dragonfly) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=df -endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1819,11 +1558,6 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif -ifeq ($(OS_TARGET),aros) -EXEEXT= -SHAREDLIBEXT=.library -SHORTSUFFIX=aros -endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -1897,30 +1631,6 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif -ifeq ($(OS_TARGET),aix) -BATCHEXT=.sh -EXEEXT= -SHORTSUFFIX=aix -endif -ifeq ($(OS_TARGET),java) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=java -endif -ifeq ($(CPU_TARGET),jvm) -ifeq ($(OS_TARGET),android) -OEXT=.class -ASMEXT=.j -SHAREDLIBEXT=.jar -SHORTSUFFIX=android -endif -endif -ifeq ($(OS_TARGET),msdos) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHORTSUFFIX=d16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2110,7 +1820,6 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc -NASMNAME=$(BINUTILSPREFIX)nasm ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -2139,23 +1848,11 @@ else ARPROG=$(ARNAME) endif endif -ifndef NASMPROG -ifdef CROSSBINDIR -NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT) -else -NASMPROG=$(NASMNAME) -endif -endif AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) -NASM=$(NASMPROG) -ifdef inUnix -PPAS=./ppas$(SRCBATCHEXT) -else PPAS=ppas$(SRCBATCHEXT) -endif ifdef inUnix LDCONFIG=ldconfig else @@ -2287,12 +1984,17 @@ endif endif ifdef CREATESHARED override FPCOPT+=-Cg +ifeq ($(CPU_TARGET),i386) +override FPCOPT+=-Aas endif -ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),) +endif +ifeq ($(findstring 2.0.,$(FPC_VERSION)),) +ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif endif +endif ifdef LINKSHARED endif ifdef OPT @@ -2317,24 +2019,18 @@ endif ifdef ACROSSCOMPILE override FPCOPT+=$(CROSSOPT) endif -override COMPILER:=$(strip $(FPC) $(FPCOPT)) -ifneq (,$(findstring -sh ,$(COMPILER))) -UseEXECPPAS=1 -endif -ifneq (,$(findstring -s ,$(COMPILER))) -ifeq ($(FULL_SOURCE),$(FULL_TARGET)) -UseEXECPPAS=1 -endif -endif -ifneq ($(UseEXECPPAS),1) +override COMPILER:=$(FPC) $(FPCOPT) +ifeq (,$(findstring -s ,$(COMPILER))) 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 @@ -2770,8 +2466,6 @@ fgl$(PPUEXT): $(OBJPASDIR)/fgl.pp objpas$(PPUEXT) types$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/fgl.pp $(REDIR) macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) -ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/ucomplex.pp getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/getopts.pp heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/gba/Makefile.fpc b/rtl/gba/Makefile.fpc index fc7478a60b..6223a11830 100644 --- a/rtl/gba/Makefile.fpc +++ b/rtl/gba/Makefile.fpc @@ -6,7 +6,7 @@ main=rtl [target] -loaders=prt0 cprt0 +loaders=$(LOADERS) units=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings \ # dos \ sysutils \ @@ -44,6 +44,8 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +LOADERS=prt0 cprt0 +override FPCOPT+=@rtl.cfg # Use new feature from 1.0.5 version # that generates release PPU files @@ -168,9 +170,6 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) # Other system-independent RTL Units # -ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/ucomplex.pp - getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(INC)/getopts.pp diff --git a/rtl/gba/rtl.cfg b/rtl/gba/rtl.cfg new file mode 100644 index 0000000000..3bae972ccb --- /dev/null +++ b/rtl/gba/rtl.cfg @@ -0,0 +1,26 @@ + -Sf- + -SfHEAP + -SfINITFINAL + -SfCLASSES + -SfEXCEPTIONS + -SfEXITCODE + -SfANSISTRINGS + -SfWIDESTRINGS + -SfTEXTIO +# -SfCONSOLEIO + -SfFILEIO + -SfRANDOM + -SfVARIANTS + -SfOBJECTS + -SfDYNARRAYS + -SfTHREADING + -SfCOMMANDARGS + -SfPROCESSES + -SfSTACKCHECK +# -SfDYNLIBS + -SfEXITCODE + +#ifdef CPUARM +-SfSOFTFPU +-SfRTTI +#endif CPUARM
\ No newline at end of file |