Browse Source

* Fixed gba rtl: it generated corrupted executables
* Changed nds tool: grit has been replaced by grit_fpc (https://github.com/flodd/grit_fpc) to simplify the nds programming workflow

git-svn-id: trunk@30074 -

Legolas 10 years ago
parent
commit
177b007eba
83 changed files with 192 additions and 472 deletions
  1. 1 0
      .gitattributes
  2. 1 1
      packages/libgbafpc/Makefile.fpc.fpcmake
  3. 1 1
      packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc
  4. 1 1
      packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc
  5. 1 1
      packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc
  6. 1 1
      packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc
  7. 1 1
      packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc
  8. 1 1
      packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc
  9. 1 1
      packages/libndsfpc/examples/audio/micrecord/Makefile.fpc
  10. 1 1
      packages/libndsfpc/examples/card/eeprom/Makefile.fpc
  11. 1 1
      packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc
  12. 1 1
      packages/libndsfpc/examples/ds_motion/Makefile.fpc
  13. 1 1
      packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc
  14. 1 1
      packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc
  15. 1 1
      packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc
  16. 1 1
      packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc
  17. 1 1
      packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc
  18. 1 1
      packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc
  19. 1 1
      packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc
  20. 1 1
      packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc
  21. 1 1
      packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc
  22. 1 1
      packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc
  23. 1 1
      packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc
  24. 1 1
      packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc
  25. 1 1
      packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc
  26. 1 1
      packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc
  27. 1 1
      packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc
  28. 1 1
      packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc
  29. 1 1
      packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc
  30. 1 1
      packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc
  31. 1 1
      packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc
  32. 1 1
      packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc
  33. 1 1
      packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc
  34. 1 1
      packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc
  35. 1 1
      packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc
  36. 1 1
      packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc
  37. 1 1
      packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc
  38. 1 1
      packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc
  39. 1 1
      packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc
  40. 1 1
      packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc
  41. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc
  42. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc
  43. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc
  44. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc
  45. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc
  46. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc
  47. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc
  48. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc
  49. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc
  50. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc
  51. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc
  52. 1 1
      packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc
  53. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc
  54. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc
  55. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc
  56. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc
  57. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc
  58. 1 1
      packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc
  59. 1 1
      packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc
  60. 1 1
      packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc
  61. 1 1
      packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc
  62. 1 1
      packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc
  63. 1 1
      packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc
  64. 1 1
      packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc
  65. 1 1
      packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc
  66. 1 1
      packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc
  67. 1 1
      packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc
  68. 1 1
      packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc
  69. 1 1
      packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc
  70. 1 1
      packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc
  71. 1 1
      packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc
  72. 1 1
      packages/libndsfpc/examples/hello_world/Makefile.fpc
  73. 1 1
      packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc
  74. 1 1
      packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc
  75. 1 1
      packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc
  76. 1 1
      packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc
  77. 1 1
      packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc
  78. 1 1
      packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc
  79. 1 1
      packages/libndsfpc/examples/time/stopwatch/Makefile.fpc
  80. 1 1
      packages/libndsfpc/examples/time/timercallback/Makefile.fpc
  81. 83 389
      rtl/gba/Makefile
  82. 3 4
      rtl/gba/Makefile.fpc
  83. 26 0
      rtl/gba/rtl.cfg

+ 1 - 0
.gitattributes

@@ -8263,6 +8263,7 @@ rtl/gba/gbabiosh.inc svneol=native#text/plain
 rtl/gba/libc.inc svneol=native#text/plain
 rtl/gba/libc.inc svneol=native#text/plain
 rtl/gba/libch.inc svneol=native#text/plain
 rtl/gba/libch.inc svneol=native#text/plain
 rtl/gba/prt0.as svneol=native#text/plain
 rtl/gba/prt0.as svneol=native#text/plain
+rtl/gba/rtl.cfg svneol=native#text/plain
 rtl/gba/rtldefs.inc svneol=native#text/plain
 rtl/gba/rtldefs.inc svneol=native#text/plain
 rtl/gba/sysdir.inc svneol=native#text/plain
 rtl/gba/sysdir.inc svneol=native#text/plain
 rtl/gba/sysfile.inc svneol=native#text/plain
 rtl/gba/sysfile.inc svneol=native#text/plain

+ 1 - 1
packages/libgbafpc/Makefile.fpc.fpcmake

@@ -18,7 +18,7 @@ includedir=src src/maxmod
 sourcedir=src tests
 sourcedir=src tests
 
 
 [prerules]
 [prerules]
-BINUTILSPREFIX=arm-eabi-
+BINUTILSPREFIX=arm-none-eabi-
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile.fpc

@@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile.fpc

@@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/reverb/Makefile.fpc

@@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile.fpc

@@ -87,7 +87,7 @@ mmsolution.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile.fpc

@@ -87,7 +87,7 @@ mmsolution.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/maxmod/streaming/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/audio/micrecord/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/card/eeprom/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/debugging/exceptionTest/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/ds_motion/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/dswifi/ap_search/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/dswifi/autoconnect/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/dswifi/httpget/Makefile.fpc

@@ -83,7 +83,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile.fpc

@@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile.fpc

@@ -85,7 +85,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile.fpc

@@ -84,7 +84,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile.fpc

@@ -84,7 +84,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MOVE) /Y $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MOVE) /Y $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile.fpc

@@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/dual_screen/Makefile.fpc

@@ -86,7 +86,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/fonts/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/primitives/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/scrolling/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/gl2d/sprites/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Display_List/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Ortho/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Picking/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile.fpc

@@ -88,7 +88,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Effects/windows/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/simple/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/hello_world/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/time/RealTimeClock/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/time/stopwatch/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 1 - 1
packages/libndsfpc/examples/time/timercallback/Makefile.fpc

@@ -87,7 +87,7 @@ soundbank.bin.o : $(AUDIO_FILES)
 #
 #
 $(GFX_FILES): $(wildcard %.bmp %.png)
 $(GFX_FILES): $(wildcard %.bmp %.png)
         @echo 'Converting $(@) file to asm...'
         @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...'
         @echo 'Assembling $(@).s file...'
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(AS) -o $(BUILD)/$(basename $(@)).o $(BUILD)/$(basename $(@)).s
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           
         $(MV) -f $(BUILD)/$(basename $(@)).inc $(INC)/$(basename $(@)).inc           

+ 83 - 389
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
 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
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 FORCE:
 .PHONY: FORCE
 .PHONY: FORCE
@@ -180,18 +180,6 @@ else
 ARCH=$(CPU_TARGET)
 ARCH=$(CPU_TARGET)
 endif
 endif
 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)),)
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -217,14 +205,6 @@ endif
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 linuxHier=1
 linuxHier=1
 endif
 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
 export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
 ifdef FPCDIR
 ifdef FPCDIR
 override FPCDIR:=$(subst \,/,$(FPCDIR))
 override FPCDIR:=$(subst \,/,$(FPCDIR))
@@ -273,27 +253,8 @@ endif
 ifndef BINUTILSPREFIX
 ifndef BINUTILSPREFIX
 ifndef CROSSBINDIR
 ifndef CROSSBINDIR
 ifdef CROSSCOMPILE
 ifdef CROSSCOMPILE
-ifneq ($(OS_TARGET),msdos)
 ifndef DARWIN2DARWIN
 ifndef DARWIN2DARWIN
-ifneq ($(CPU_TARGET),jvm)
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
 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
 endif
 endif
 endif
@@ -335,6 +296,8 @@ COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
 PROCINC=$(RTL)/$(CPU_TARGET)
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+LOADERS=prt0 cprt0
+override [email protected]
 ifdef RELEASE
 ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
@@ -406,12 +369,6 @@ endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 endif
@@ -460,9 +417,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 endif
@@ -499,12 +453,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 endif
@@ -529,9 +477,6 @@ endif
 ifeq ($(FULL_TARGET),arm-symbian)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 endif
@@ -541,9 +486,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 endif
@@ -553,30 +495,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings sysutils classes math typinfo ctypes charset cpall getopts types rtlconsts sysconst lineinfo fgl
 endif
 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)
 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
 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
 endif
@@ -643,12 +564,6 @@ endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 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
 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
 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)
 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
 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
 endif
@@ -697,9 +612,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 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
 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
 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)
 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
 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
 endif
@@ -736,12 +648,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 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
 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
 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)
 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
 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
 endif
@@ -766,9 +672,6 @@ endif
 ifeq ($(FULL_TARGET),arm-symbian)
 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
 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
 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)
 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
 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
 endif
@@ -778,9 +681,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 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
 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
 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)
 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
 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
 endif
@@ -790,266 +690,203 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 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
 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
 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)
 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
 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
 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)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 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
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 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
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 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
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 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
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 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
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_LOADERS+=prt0 cprt0
+override TARGET_LOADERS+=$(LOADERS)
 endif
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 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
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 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
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
@@ -1118,12 +955,6 @@ endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 ifeq ($(FULL_TARGET),i386-iphonesim)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 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)
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
@@ -1172,9 +1003,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 ifeq ($(FULL_TARGET),powerpc-wii)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
-ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
@@ -1211,12 +1039,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 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)
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
@@ -1241,9 +1063,6 @@ endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
-ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
@@ -1253,9 +1072,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
-ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
-endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
@@ -1265,30 +1081,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 endif
-ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
-endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 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)
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1355,12 +1150,6 @@ endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 ifeq ($(FULL_TARGET),i386-iphonesim)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 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)
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1409,9 +1198,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 ifeq ($(FULL_TARGET),powerpc-wii)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
-ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1448,12 +1234,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 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)
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1478,9 +1258,6 @@ endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
-ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1490,9 +1267,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
-ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
-endif
 ifeq ($(FULL_TARGET),avr-embedded)
 ifeq ($(FULL_TARGET),avr-embedded)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
@@ -1502,30 +1276,9 @@ endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 ifeq ($(FULL_TARGET),armeb-embedded)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 endif
-ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
-endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 ifeq ($(FULL_TARGET),mipsel-linux)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
 endif
 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
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
 endif
@@ -1754,26 +1507,12 @@ SHAREDLIBEXT=.dll
 SHORTSUFFIX=wat
 SHORTSUFFIX=wat
 IMPORTLIBPREFIX=
 IMPORTLIBPREFIX=
 endif
 endif
-ifneq ($(CPU_TARGET),jvm)
-ifeq ($(OS_TARGET),android)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=lnx
-endif
-endif
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 BATCHEXT=.sh
 EXEEXT=
 EXEEXT=
 HASSHAREDLIB=1
 HASSHAREDLIB=1
 SHORTSUFFIX=lnx
 SHORTSUFFIX=lnx
 endif
 endif
-ifeq ($(OS_TARGET),dragonfly)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=df
-endif
 ifeq ($(OS_TARGET),freebsd)
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 BATCHEXT=.sh
 EXEEXT=
 EXEEXT=
@@ -1819,11 +1558,6 @@ EXEEXT=
 SHAREDLIBEXT=.library
 SHAREDLIBEXT=.library
 SHORTSUFFIX=amg
 SHORTSUFFIX=amg
 endif
 endif
-ifeq ($(OS_TARGET),aros)
-EXEEXT=
-SHAREDLIBEXT=.library
-SHORTSUFFIX=aros
-endif
 ifeq ($(OS_TARGET),morphos)
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 EXEEXT=
 SHAREDLIBEXT=.library
 SHAREDLIBEXT=.library
@@ -1897,30 +1631,6 @@ EXEEXT=.dol
 SHAREDLIBEXT=.so
 SHAREDLIBEXT=.so
 SHORTSUFFIX=wii
 SHORTSUFFIX=wii
 endif
 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)),)
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -2110,7 +1820,6 @@ ASNAME=$(BINUTILSPREFIX)as
 LDNAME=$(BINUTILSPREFIX)ld
 LDNAME=$(BINUTILSPREFIX)ld
 ARNAME=$(BINUTILSPREFIX)ar
 ARNAME=$(BINUTILSPREFIX)ar
 RCNAME=$(BINUTILSPREFIX)rc
 RCNAME=$(BINUTILSPREFIX)rc
-NASMNAME=$(BINUTILSPREFIX)nasm
 ifndef ASPROG
 ifndef ASPROG
 ifdef CROSSBINDIR
 ifdef CROSSBINDIR
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@@ -2139,23 +1848,11 @@ else
 ARPROG=$(ARNAME)
 ARPROG=$(ARNAME)
 endif
 endif
 endif
 endif
-ifndef NASMPROG
-ifdef CROSSBINDIR
-NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
-else
-NASMPROG=$(NASMNAME)
-endif
-endif
 AS=$(ASPROG)
 AS=$(ASPROG)
 LD=$(LDPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
 RC=$(RCPROG)
 AR=$(ARPROG)
 AR=$(ARPROG)
-NASM=$(NASMPROG)
-ifdef inUnix
-PPAS=./ppas$(SRCBATCHEXT)
-else
 PPAS=ppas$(SRCBATCHEXT)
 PPAS=ppas$(SRCBATCHEXT)
-endif
 ifdef inUnix
 ifdef inUnix
 LDCONFIG=ldconfig
 LDCONFIG=ldconfig
 else
 else
@@ -2287,12 +1984,17 @@ endif
 endif
 endif
 ifdef CREATESHARED
 ifdef CREATESHARED
 override FPCOPT+=-Cg
 override FPCOPT+=-Cg
+ifeq ($(CPU_TARGET),i386)
+override FPCOPT+=-Aas
 endif
 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
 override FPCOPT+=-Cg
 endif
 endif
 endif
 endif
+endif
 ifdef LINKSHARED
 ifdef LINKSHARED
 endif
 endif
 ifdef OPT
 ifdef OPT
@@ -2317,24 +2019,18 @@ endif
 ifdef ACROSSCOMPILE
 ifdef ACROSSCOMPILE
 override FPCOPT+=$(CROSSOPT)
 override FPCOPT+=$(CROSSOPT)
 endif
 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=
 EXECPPAS=
 else
 else
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
 ifdef RUNBATCH
 ifdef RUNBATCH
 EXECPPAS:=@$(RUNBATCH) $(PPAS)
 EXECPPAS:=@$(RUNBATCH) $(PPAS)
 else
 else
 EXECPPAS:=@$(PPAS)
 EXECPPAS:=@$(PPAS)
 endif
 endif
 endif
 endif
+endif
 .PHONY: fpc_loaders
 .PHONY: fpc_loaders
 ifneq ($(TARGET_LOADERS),)
 ifneq ($(TARGET_LOADERS),)
 override ALLTARGET+=fpc_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)
 	$(COMPILER) -Sg $(OBJPASDIR)/fgl.pp $(REDIR)
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 	$(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)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(INC)/getopts.pp
 	$(COMPILER) $(INC)/getopts.pp
 heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)
 heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)

+ 3 - 4
rtl/gba/Makefile.fpc

@@ -6,7 +6,7 @@
 main=rtl
 main=rtl
 
 
 [target]
 [target]
-loaders=prt0 cprt0
+loaders=$(LOADERS)
 units=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings \
 units=$(SYSTEMUNIT) uuchar objpas macpas iso7185 strings \
 #      dos \
 #      dos \
       sysutils \
       sysutils \
@@ -44,6 +44,8 @@ COMMON=$(RTL)/common
 PROCINC=$(RTL)/$(CPU_TARGET)
 PROCINC=$(RTL)/$(CPU_TARGET)
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
+LOADERS=prt0 cprt0
+override [email protected]
 
 
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files
@@ -168,9 +170,6 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 # Other system-independent RTL Units
 # 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)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(INC)/getopts.pp
 	$(COMPILER) $(INC)/getopts.pp
 
 

+ 26 - 0
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