From afc6d5121718ccd3923f0e89a983f7493e5cfded Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Thu, 18 Nov 2021 23:16:17 +0100 Subject: [PATCH] fxsdk: add more fxg1a/mkg3a flags in generate_{g1a,g3a}() --- fxsdk/cmake/GenerateG1A.cmake | 8 ++++++++ fxsdk/cmake/GenerateG3A.cmake | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/fxsdk/cmake/GenerateG1A.cmake b/fxsdk/cmake/GenerateG1A.cmake index 01e743e..5a1b31f 100644 --- a/fxsdk/cmake/GenerateG1A.cmake +++ b/fxsdk/cmake/GenerateG1A.cmake @@ -35,6 +35,14 @@ function(generate_g1a) list(APPEND FXG1A_ARGS "-i" "${G1A_ICON}") endif() + if(DEFINED G1A_INTERNAL) + list(APPEND FXG1A_ARGS "--internal=${G1A_INTERNAL}") + endif() + + if(DEFINED G1A_VERSION) + list(APPEND FXG1A_ARGS "--version=${G1A_VERSION}") + endif() + string(REGEX REPLACE "sh-elf-gcc$" "sh-elf-objcopy" OBJCOPY "${CMAKE_C_COMPILER}") add_custom_command( diff --git a/fxsdk/cmake/GenerateG3A.cmake b/fxsdk/cmake/GenerateG3A.cmake index 8e888e8..69e6dbe 100644 --- a/fxsdk/cmake/GenerateG3A.cmake +++ b/fxsdk/cmake/GenerateG3A.cmake @@ -1,5 +1,5 @@ function(generate_g3a) - cmake_parse_arguments(G3A "" "TARGET;OUTPUT;NAME" "ICONS" ${ARGN}) + cmake_parse_arguments(G3A "" "TARGET;OUTPUT;NAME;VERSION" "ICONS" ${ARGN}) # Check arguments @@ -36,6 +36,10 @@ function(generate_g3a) list(APPEND MKG3A_ARGS "-n" "basic:${G3A_NAME}") endif() + if(DEFINED G3A_VERSION) + list(APPEND MKG3A_ARGS "-V" "${G3A_VERSION}") + endif() + if(DEFINED G3A_ICONS) list(GET G3A_ICONS 0 G3A_ICON1) list(GET G3A_ICONS 1 G3A_ICON2)