From 7b2294d8c0c308dff2762fd55c2d6ad563636805 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Tue, 17 Jan 2023 10:13:11 +0100
Subject: [PATCH] fxsdk: don't generate G3A in fastload, use bin

---
 fxsdk/cmake/GenerateG3A.cmake | 3 ++-
 fxsdk/fxsdk.sh                | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fxsdk/cmake/GenerateG3A.cmake b/fxsdk/cmake/GenerateG3A.cmake
index 9eb40ce..129660d 100644
--- a/fxsdk/cmake/GenerateG3A.cmake
+++ b/fxsdk/cmake/GenerateG3A.cmake
@@ -63,8 +63,9 @@ function(generate_g3a)
   add_custom_command(
     TARGET "${G3A_TARGET}" POST_BUILD
     COMMAND ${OBJCOPY} -O binary -R .bss -R .gint_bss ${G3A_TARGET} ${G3A_TARGET}.bin
-    COMMAND fxgxa --g3a ${FXGXA_ARGS} ${G3A_TARGET}.bin -o ${G3A_OUTPUT}
+    COMMAND "$<IF:$<CONFIG:FastLoad>,,fxgxa;--g3a;${FXGXA_ARGS};${G3A_TARGET}.bin;-o;${G3A_OUTPUT}>"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+    COMMAND_EXPAND_LISTS
   )
   if(DEFINED G3A_ICONS)
     set_target_properties("${G3A_TARGET}" PROPERTIES
diff --git a/fxsdk/fxsdk.sh b/fxsdk/fxsdk.sh
index 860d7fd..d0f6668 100755
--- a/fxsdk/fxsdk.sh
+++ b/fxsdk/fxsdk.sh
@@ -262,9 +262,9 @@ fxsdk_send_cg-push() {
     echo "error: fxlink is not installed or not available"
     return 1
   fi
-  g3a_files=$(find -maxdepth 1 -name '*.g3a')
-  echo "$TAG Running: fxlink -pw ${g3a_files}"
-  fxlink -pw ${g3a_files}
+  bin_files=$(find "build-cg-push" -maxdepth 1 -name '*.bin')
+  echo "$TAG Running: fxlink -pw ${bin_files}"
+  fxlink -pw ${bin_files}
 }
 
 fxsdk_path() {