From 3822d1b0d54efca5d8ec1b27064edf50bf34dd72 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Wed, 6 Sep 2023 11:24:11 +0200 Subject: update sameboy, update rgbds usage --- cmake/FindSameBoyBootRom.cmake | 4 ++-- deps/SameBoy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindSameBoyBootRom.cmake b/cmake/FindSameBoyBootRom.cmake index ac2b3c5..52f2e5a 100644 --- a/cmake/FindSameBoyBootRom.cmake +++ b/cmake/FindSameBoyBootRom.cmake @@ -20,7 +20,7 @@ mark_as_advanced(RGBASM RGBLINK RGBGFX DD) add_custom_command( OUTPUT SameBoyLogo.pb12 COMMAND - ${RGBGFX} -h -u -o SameBoyLogo.2bpp ${SAMEBOY_BOOTROM_PATH}/SameBoyLogo.png + ${RGBGFX} -Z -u -c embedded -o SameBoyLogo.2bpp ${SAMEBOY_BOOTROM_PATH}/SameBoyLogo.png COMMAND pb12 < SameBoyLogo.2bpp > SameBoyLogo.pb12 MAIN_DEPENDENCY ${SAMEBOY_BOOTROM_PATH}/SameBoyLogo.png @@ -31,7 +31,7 @@ add_custom_command( add_custom_command( OUTPUT ${SAMEBOY_BOOTROM_VERSION}.bin COMMAND - ${RGBASM} -o ${SAMEBOY_BOOTROM_VERSION}.tmp ${SAMEBOY_BOOTROM_PATH}/${SAMEBOY_BOOTROM_VERSION}.asm + ${RGBASM} -i ${SAMEBOY_BOOTROM_PATH} -o ${SAMEBOY_BOOTROM_VERSION}.tmp ${SAMEBOY_BOOTROM_PATH}/${SAMEBOY_BOOTROM_VERSION}.asm COMMAND ${RGBLINK} -o ${SAMEBOY_BOOTROM_VERSION}.tmp2 ${SAMEBOY_BOOTROM_VERSION}.tmp COMMAND diff --git a/deps/SameBoy b/deps/SameBoy index b7f03de..5192e3a 160000 --- a/deps/SameBoy +++ b/deps/SameBoy @@ -1 +1 @@ -Subproject commit b7f03dea8dd98fa90ce5d7c7e8e05ff4cee81362 +Subproject commit 5192e3a07be29ff6b0f5aaffbf2b943f17585f42 -- cgit v1.2.3