diff --git a/Makefile b/Makefile index b107481d..9ea6c270 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ run: install run-studio: install ./dist/current/bin/nostalgia-studio -profile dist/current/share/nostalgia-studio.json gba-run: make - ${ENV_RUN} mgba-qt build/current/src/player/nostalgia.bin + mgba-qt build/current/nostalgia.bin gdb: make gdb ./build/current/src/wombat/wombat gdb-studio: make diff --git a/scripts/build_rom.sh b/scripts/build_rom.sh index fe9c065e..9d7f8c50 100755 --- a/scripts/build_rom.sh +++ b/scripts/build_rom.sh @@ -7,6 +7,6 @@ echo NOSTALGIA_MEDIA_HEADER_________ > media_header.txt ./dist/current/bin/oxfs format 32 1k nostalgia_media.oxfs ./dist/current/bin/nost-pack -fs nostalgia_media.oxfs -img charset.png -inode 101 -tiles 40 -bpp 4 -c -${DEVKITARM}/bin/padbin 32 build/gba-release/src/nostalgia/player/nostalgia.bin -cat build/gba-release/src/nostalgia/player/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba +${DEVKITARM}/bin/padbin 32 build/gba-release/nostalgia.bin +cat build/gba-release/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba ${DEVKITARM}/bin/gbafix nostalgia.gba diff --git a/src/nostalgia/player/CMakeLists.txt b/src/nostalgia/player/CMakeLists.txt index 6ef86335..d1e25608 100644 --- a/src/nostalgia/player/CMakeLists.txt +++ b/src/nostalgia/player/CMakeLists.txt @@ -14,7 +14,7 @@ if(COMMAND OBJCOPY_FILE) COMPILER_FLAGS "-mthumb -mthumb-interwork" ) - OBJCOPY_FILE(nostalgia) + OBJCOPY_FILE(../../../nostalgia) #PADBIN_FILE(nostalgia) endif()