fxsdk: don't generate G3A in fastload, use bin

This commit is contained in:
Lephenixnoir 2023-01-17 10:13:11 +01:00
parent d91e6b7497
commit 7b2294d8c0
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 5 additions and 4 deletions

View file

@ -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

View file

@ -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() {