diff --git a/Assets/dll/bsnes.wbx.zst b/Assets/dll/bsnes.wbx.zst index 58cb59c09a..e2722b9048 100644 Binary files a/Assets/dll/bsnes.wbx.zst and b/Assets/dll/bsnes.wbx.zst differ diff --git a/Assets/dll/libsameboy.dll b/Assets/dll/libsameboy.dll index c485c79872..005b9298a7 100644 Binary files a/Assets/dll/libsameboy.dll and b/Assets/dll/libsameboy.dll differ diff --git a/Assets/dll/libsameboy.so b/Assets/dll/libsameboy.so index 4c5891f02d..404f6df993 100755 Binary files a/Assets/dll/libsameboy.so and b/Assets/dll/libsameboy.so differ diff --git a/submodules/sameboy/CMakeLists.txt b/submodules/sameboy/CMakeLists.txt index b72b12e4e3..d9e3d2997f 100644 --- a/submodules/sameboy/CMakeLists.txt +++ b/submodules/sameboy/CMakeLists.txt @@ -91,6 +91,7 @@ target_include_directories(core PUBLIC ${CORE_DIR}) if(MSVC) target_include_directories(core PUBLIC ${CMAKE_SOURCE_DIR}/libsameboy/Windows) + target_sources(core PRIVATE ${CMAKE_SOURCE_DIR}/libsameboy/Windows/stdio.c) endif() add_library( diff --git a/submodules/sameboy/libsameboy b/submodules/sameboy/libsameboy index 5d06f45c0f..20e5e18122 160000 --- a/submodules/sameboy/libsameboy +++ b/submodules/sameboy/libsameboy @@ -1 +1 @@ -Subproject commit 5d06f45c0f8c0cc819409e266780ae653af331e9 +Subproject commit 20e5e181223b31fc2464a12351da6526af9bfbdc diff --git a/waterbox/bsnescore/bsnes/sfc/coprocessor/icd/icd.cpp b/waterbox/bsnescore/bsnes/sfc/coprocessor/icd/icd.cpp index d88f0f03ca..9ecf100ea0 100644 --- a/waterbox/bsnescore/bsnes/sfc/coprocessor/icd/icd.cpp +++ b/waterbox/bsnescore/bsnes/sfc/coprocessor/icd/icd.cpp @@ -46,7 +46,7 @@ namespace SameBoy { 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 { } }