aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2023-09-06 11:24:11 +0200
committerJan200101 <sentrycraft123@gmail.com>2023-09-06 11:24:11 +0200
commit3822d1b0d54efca5d8ec1b27064edf50bf34dd72 (patch)
tree80586be0492a8e294e026046a733b6d7b8377a62
parenta4ee0c9279d75f5d4e387fcac1c6cce46957b3e0 (diff)
downloadsameboy-thumbnailer-3822d1b0d54efca5d8ec1b27064edf50bf34dd72.tar.gz
sameboy-thumbnailer-3822d1b0d54efca5d8ec1b27064edf50bf34dd72.zip
update sameboy, update rgbds usage
-rw-r--r--cmake/FindSameBoyBootRom.cmake4
m---------deps/SameBoy0
2 files changed, 2 insertions, 2 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
-Subproject b7f03dea8dd98fa90ce5d7c7e8e05ff4cee8136
+Subproject 5192e3a07be29ff6b0f5aaffbf2b943f17585f4