From e866a909dc46dd8708f440e159ea09a3c4b7781a Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Mon, 12 Oct 2020 16:52:54 +1100 Subject: [PATCH] Apply bsnes' customisations back on top of the upstream SameBoy source. This includes changes to SameBoy (updating the README to be clear about provenance, and adding a GNUmakefile to integrate with bsnes' build system), updates the SameBoy version number in the about box, and adds SameBoy to the list of subtrees updated by update-subtrees.sh. --- bsnes/gb/GNUmakefile | 26 +++++++++++++++++++ bsnes/gb/README.md | 4 +++ .../presentation/presentation.cpp | 2 +- update-subtrees.sh | 6 +++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 bsnes/gb/GNUmakefile diff --git a/bsnes/gb/GNUmakefile b/bsnes/gb/GNUmakefile new file mode 100644 index 00000000..b94dfa0c --- /dev/null +++ b/bsnes/gb/GNUmakefile @@ -0,0 +1,26 @@ +flags += -DGB_INTERNAL -DGB_DISABLE_DEBUGGER -DGB_DISABLE_CHEATS -D_GNU_SOURCE -Wno-multichar +options += -I../sameboy + +objects += gb-apu gb-camera gb-rumble gb-display gb-gb gb-joypad gb-mbc +objects += gb-memory gb-printer gb-random gb-rewind gb-save_state gb-sgb +objects += gb-sm83_cpu gb-symbol_hash gb-timing +#objects+= gb-debugger gb-sm83_disassembler + +obj/gb-apu.o: gb/Core/apu.c +obj/gb-camera.o: gb/Core/camera.c +obj/gb-debugger.o: gb/Core/debugger.c +obj/gb-rumble.o: gb/Core/rumble.c +obj/gb-display.o: gb/Core/display.c +obj/gb-gb.o: gb/Core/gb.c +obj/gb-joypad.o: gb/Core/joypad.c +obj/gb-mbc.o: gb/Core/mbc.c +obj/gb-memory.o: gb/Core/memory.c +obj/gb-printer.o: gb/Core/printer.c +obj/gb-random.o: gb/Core/random.c +obj/gb-rewind.o: gb/Core/rewind.c +obj/gb-save_state.o: gb/Core/save_state.c +obj/gb-sgb.o: gb/Core/sgb.c +obj/gb-sm83_cpu.o: gb/Core/sm83_cpu.c +obj/gb-sm83_disassembler.o: gb/Core/sm83_disassembler.c +obj/gb-symbol_hash.o: gb/Core/symbol_hash.c +obj/gb-timing.o: gb/Core/timing.c diff --git a/bsnes/gb/README.md b/bsnes/gb/README.md index 1107fdc4..a2dbcb2e 100644 --- a/bsnes/gb/README.md +++ b/bsnes/gb/README.md @@ -2,6 +2,10 @@ SameBoy is an open source Game Boy (DMG) and Game Boy Color (CGB) emulator, written in portable C. It has a native Cocoa frontend for macOS, an SDL frontend for other operating systems, and a libretro core. It also includes a text-based debugger with an expression evaluator. Visit [the website](https://sameboy.github.io/). +## bsnes integration + +This directory should be a clean copy of the upstream SameBoy source, with the exception of this section of the README, and the `GNUmakefile` file that integrates it with bsnes' build system. Only files in the `Core/` directory are used, none of the UI or other portions. + ## Features Features common to both Cocoa and SDL versions: * Supports Game Boy (DMG) and Game Boy Color (CGB) emulation diff --git a/bsnes/target-bsnes/presentation/presentation.cpp b/bsnes/target-bsnes/presentation/presentation.cpp index 4fb613e5..171c4ffd 100644 --- a/bsnes/target-bsnes/presentation/presentation.cpp +++ b/bsnes/target-bsnes/presentation/presentation.cpp @@ -183,7 +183,7 @@ auto Presentation::create() -> void { .setName("SameBoy") .setLogo(Resource::SameBoy) .setDescription("Super Game Boy emulator") - .setVersion("0.13.1") + .setVersion("0.13.6") .setCopyright("Lior Halphon") .setLicense("MIT") .setWebsite("https://sameboy.github.io") diff --git a/update-subtrees.sh b/update-subtrees.sh index c4e53e26..d89dd049 100755 --- a/update-subtrees.sh +++ b/update-subtrees.sh @@ -11,3 +11,9 @@ cd "$(dirname "$0")" || exit 1 # Merge changes from the libco repository. git subtree pull --prefix=libco https://github.com/higan-emu/libco.git master + +# Merge changes from SameBoy +git subtree pull --prefix=bsnes/gb https://github.com/LIJI32/SameBoy.git master +echo "If SameBoy updated, remember to update the SameBoy version" +echo "in bsnes/target-bsnes/presentation/presentation.cpp !" +