mirror of
https://github.com/libretro/bsnes-libretro.git
synced 2024-11-23 00:49:40 +00:00
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.
This commit is contained in:
parent
ec18efcb04
commit
e866a909dc
26
bsnes/gb/GNUmakefile
Normal file
26
bsnes/gb/GNUmakefile
Normal file
@ -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
|
@ -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
|
||||
|
@ -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")
|
||||
|
@ -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 !"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user