From 705147e1804cecd911e27fa84c3e21fc70dccef9 Mon Sep 17 00:00:00 2001
From: Heath123 <heath.mitchell27@gmail.com>
Date: Fri, 5 May 2023 20:44:06 +0100
Subject: [PATCH] Make the build system build a g3a

---
 Makefile                                            |   1 +
 build/platform.simulator.prizm.mak                  |   4 ++--
 build/targets.simulator.prizm.mak                   |   5 +++++
 build/toolchain.sh-elf-gcc.mak                      |   4 ++--
 ion/src/simulator/prizm/Makefile                    |   2 +-
 .../src/simulator/prizm/assets/icon-sel.png         | Bin
 .../src/simulator/prizm/assets/icon-uns.png         | Bin
 7 files changed, 11 insertions(+), 5 deletions(-)
 rename icon-sel.png => ion/src/simulator/prizm/assets/icon-sel.png (100%)
 rename icon-uns.png => ion/src/simulator/prizm/assets/icon-uns.png (100%)

diff --git a/Makefile b/Makefile
index bd7f2d99a..6b7b3150c 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,7 @@ help:
 	@echo "  make PLATFORM=simulator TARGET=web"
 	@echo "  make PLATFORM=simulator TARGET=windows"
 	@echo "  make PLATFORM=simulator TARGET=3ds"
+	@echo "  make PLATFORM=simulator TARGET=prizm"
 
 .PHONY: doc
 doc:
diff --git a/build/platform.simulator.prizm.mak b/build/platform.simulator.prizm.mak
index 33981bad3..fc30c12e8 100644
--- a/build/platform.simulator.prizm.mak
+++ b/build/platform.simulator.prizm.mak
@@ -1,9 +1,9 @@
 TOOLCHAIN = sh-elf-gcc
-EXE = bin
+EXE = elf
 
 EPSILON_TELEMETRY ?= 0
 
-HANDY_TARGETS_EXTENSIONS = bin
+HANDY_TARGETS_EXTENSIONS = g3a bin
 
 USE_LIBA = 0
 POINCARE_TREE_LOG = 0
diff --git a/build/targets.simulator.prizm.mak b/build/targets.simulator.prizm.mak
index e69de29bb..d4455ee35 100644
--- a/build/targets.simulator.prizm.mak
+++ b/build/targets.simulator.prizm.mak
@@ -0,0 +1,5 @@
+$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf
+	$(OBJCOPY) -O binary -R .bss -R .gint_bss $< $@
+
+$(BUILD_DIR)/%.g3a: $(BUILD_DIR)/%.bin ion/src/simulator/prizm/assets/icon-uns.png ion/src/simulator/prizm/assets/icon-sel.png
+	$(FXGXA) --g3a --icon-uns=ion/src/simulator/prizm/assets/icon-uns.png --icon-sel=ion/src/simulator/prizm/assets/icon-sel.png -n Omega $< -o $@
diff --git a/build/toolchain.sh-elf-gcc.mak b/build/toolchain.sh-elf-gcc.mak
index a8a4b7d57..39d648c2d 100644
--- a/build/toolchain.sh-elf-gcc.mak
+++ b/build/toolchain.sh-elf-gcc.mak
@@ -5,6 +5,6 @@ GDB = gdb
 OBJCOPY = sh-elf-objcopy
 SIZE = sh-elf-size
 AS = sh-elf-as
+FXGXA = fxgxa
 
-SFLAGS += -D_PRIZM
-SFLAGS += -D_BIG_ENDIAN
+SFLAGS += -D_PRIZM -D_BIG_ENDIAN
diff --git a/ion/src/simulator/prizm/Makefile b/ion/src/simulator/prizm/Makefile
index 52718d3cd..9d80530c6 100644
--- a/ion/src/simulator/prizm/Makefile
+++ b/ion/src/simulator/prizm/Makefile
@@ -54,4 +54,4 @@ ion_src := $(filter-out $(sdl_simu_needs_to_be_removed),$(ion_src))
 SFLAGS := $(filter-out -Iion/src/simulator/external/sdl/include,$(SFLAGS))
 
 SFLAGS += -DFXCG50 -DTARGET_FXCG50 -m4-nofpu -mb -ffreestanding -nostdlib -Wa,--dsp -fstrict-volatile-bitfields -g
-LDFLAGS += -nostdlib -Wl,--no-warn-rwx-segments -T fxcg50_fastload.ld -lgint-cg -lc -lgint-cg -lc -lgcc -lopenlibm -lstdc++
+LDFLAGS += -nostdlib -Wl,--no-warn-rwx-segments -T fxcg50.ld -lgint-cg -lc -lgint-cg -lc -lgcc -lopenlibm -lstdc++
diff --git a/icon-sel.png b/ion/src/simulator/prizm/assets/icon-sel.png
similarity index 100%
rename from icon-sel.png
rename to ion/src/simulator/prizm/assets/icon-sel.png
diff --git a/icon-uns.png b/ion/src/simulator/prizm/assets/icon-uns.png
similarity index 100%
rename from icon-uns.png
rename to ion/src/simulator/prizm/assets/icon-uns.png