From 827c3025a446d0119cb9e862c38032388eb1a771 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 29 May 2024 18:01:53 +0200 Subject: [PATCH 1/2] Fix cmake build of MK2.5 and MK25S --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7725b8116..ff65e21e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -565,7 +565,7 @@ function(fw_add_variant variant_name) # Patched binary with pre-baked secondary language add_custom_command( OUTPUT ${FW_LANG_FINAL}.bin - COMMAND ${CMAKE_OBJCOPY} -O binary ${FW_LANG_BASE} ${FW_LANG_FINAL}.bin + COMMAND ${CMAKE_COMMAND} -E copy ${FW_LANG_PATCH}.bin ${FW_LANG_FINAL}.bin COMMAND "${Python3_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/lang/lang-patchsec.py ${FW_LANG_BASE} ${LANG_BIN} ${FW_LANG_FINAL}.bin DEPENDS ${FW_LANG_BASE} ${LANG_BIN} From db649976877ff84fe5cacd3fd8db30106967fbad Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 30 May 2024 08:21:51 +0200 Subject: [PATCH 2/2] Add `${FW_LANG_PATCH}.bin` to DEPENDS --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff65e21e5..e165d52e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,7 +568,7 @@ function(fw_add_variant variant_name) COMMAND ${CMAKE_COMMAND} -E copy ${FW_LANG_PATCH}.bin ${FW_LANG_FINAL}.bin COMMAND "${Python3_EXECUTABLE}" ${CMAKE_SOURCE_DIR}/lang/lang-patchsec.py ${FW_LANG_BASE} ${LANG_BIN} ${FW_LANG_FINAL}.bin - DEPENDS ${FW_LANG_BASE} ${LANG_BIN} + DEPENDS ${FW_LANG_BASE} ${FW_LANG_PATCH}.bin ${LANG_BIN} COMMENT "Generating ${FW_LANG_FINAL}.bin" )