drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

Fixed gba_build to work with the new build files layout

Browse Source
This commit is contained in:
Gary Talent 2017-10-11 21:40:35 -05:00
parent 77e0222201
commit 30a992efad
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -35,7 +35,7 @@ run: install
run-studio: install run-studio: install
./dist/current/bin/nostalgia-studio -profile dist/current/share/nostalgia-studio.json ./dist/current/bin/nostalgia-studio -profile dist/current/share/nostalgia-studio.json
gba-run: make gba-run: make
${ENV_RUN} mgba-qt build/current/src/player/nostalgia.bin mgba-qt build/current/nostalgia.bin
gdb: make gdb: make
gdb ./build/current/src/wombat/wombat gdb ./build/current/src/wombat/wombat
gdb-studio: make gdb-studio: make

4
scripts/build_rom.sh
View File

@ -7,6 +7,6 @@ echo NOSTALGIA_MEDIA_HEADER_________ > media_header.txt
./dist/current/bin/oxfs format 32 1k nostalgia_media.oxfs ./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 ./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 ${DEVKITARM}/bin/padbin 32 build/gba-release/nostalgia.bin
cat build/gba-release/src/nostalgia/player/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba cat build/gba-release/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba
${DEVKITARM}/bin/gbafix nostalgia.gba ${DEVKITARM}/bin/gbafix nostalgia.gba

2
src/nostalgia/player/CMakeLists.txt
View File

@ -14,7 +14,7 @@ if(COMMAND OBJCOPY_FILE)
COMPILER_FLAGS "-mthumb -mthumb-interwork" COMPILER_FLAGS "-mthumb -mthumb-interwork"
) )
OBJCOPY_FILE(nostalgia) OBJCOPY_FILE(../../../nostalgia)
#PADBIN_FILE(nostalgia) #PADBIN_FILE(nostalgia)
endif() endif()