mirror
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update bsnes' SameBoy integration for the new version. 

Hat tip to @alice-mkh for figuring out how to update bsnes' integration.
This commit is contained in:
Tim Allen 2025-08-31 00:44:06 +10:00
parent 85ca044ba5
commit 2e2440fe74
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bsnes/gb/GNUmakefile
View File

@ -1,13 +1,13 @@
include gb/version.mk include gb/version.mk
export VERSION export VERSION
flags += -DGB_INTERNAL -DGB_DISABLE_DEBUGGER -DGB_DISABLE_CHEATS -D_GNU_SOURCE -DGB_VERSION=\"$(VERSION)\" -Wno-multichar flags += -DGB_INTERNAL -DGB_DISABLE_DEBUGGER -DGB_DISABLE_CHEATS -D_GNU_SOURCE -DGB_VERSION=\"$(VERSION)\" -DNDEBUG -Wno-multichar
options += -I../sameboy options += -I../sameboy
objects += gb-apu gb-camera gb-rumble gb-display gb-gb gb-joypad gb-mbc 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-memory gb-printer gb-random gb-rewind gb-save_state gb-sgb
objects += gb-sm83_cpu gb-symbol_hash gb-timing objects += gb-sm83_cpu gb-timing
#objects+= gb-debugger gb-sm83_disassembler #objects+= gb-debugger gb-sm83_disassembler gb-symbol_hash
obj/gb-apu.o: gb/Core/apu.c obj/gb-apu.o: gb/Core/apu.c
obj/gb-camera.o: gb/Core/camera.c obj/gb-camera.o: gb/Core/camera.c

4
bsnes/sfc/coprocessor/icd/icd.cpp
View File

@ -42,10 +42,10 @@ namespace SameBoy {
icd.apuWrite(left, right); icd.apuWrite(left, right);
} }
static auto vblank(GB_gameboy_t*) -> void { static auto vblank(GB_gameboy_t*, GB_vblank_type_t) -> void {
} }
static auto log(GB_gameboy_t *gb, const char *string, GB_log_attributes attributes) -> void { static auto log(GB_gameboy_t *gb, const char *string, GB_log_attributes_t attributes) -> void {
} }
} }

12
bsnes/sfc/sfc.hpp
View File

@ -3,6 +3,13 @@
//license: GPLv3 //license: GPLv3
//started: 2004-10-14 //started: 2004-10-14
extern "C" {
#include <gb/Core/gb.h>
#include <gb/Core/random.h>
// Avoid conflict between `unreachable()` in SameBoy and `unreachable` in nall
#undef unreachable
}
#include <emulator/emulator.hpp> #include <emulator/emulator.hpp>
#include <emulator/random.hpp> #include <emulator/random.hpp>
#include <emulator/cheat.hpp> #include <emulator/cheat.hpp>
@ -14,11 +21,6 @@
#include <processor/upd96050/upd96050.hpp> #include <processor/upd96050/upd96050.hpp>
#include <processor/wdc65816/wdc65816.hpp> #include <processor/wdc65816/wdc65816.hpp>
extern "C" {
#include <gb/Core/gb.h>
#include <gb/Core/random.h>
}
namespace SuperFamicom { namespace SuperFamicom {
#define platform Emulator::platform #define platform Emulator::platform
namespace File = Emulator::File; namespace File = Emulator::File;