From 4d648c4f7c61fba5c9ff8b1ad4555e0a7f76e27e Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 7 Feb 2022 00:57:46 -0800 Subject: [PATCH] Windows: MSVC fixes --- src/gb/core.c | 2 +- src/gba/core.c | 2 +- src/platform/sdl/CMakeLists.txt | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gb/core.c b/src/gb/core.c index 7a1191bb5..033f94aa6 100644 --- a/src/gb/core.c +++ b/src/gb/core.c @@ -453,7 +453,7 @@ static void _GBCoreUnloadROM(struct mCore* core) { mCheatDeviceDestroy(gbcore->cheatDevice); gbcore->cheatDevice = NULL; } - return GBUnloadROM(core->board); + GBUnloadROM(core->board); } static void _GBCoreChecksum(const struct mCore* core, void* data, enum mCoreChecksumType type) { diff --git a/src/gba/core.c b/src/gba/core.c index 328f3d128..8515fa9c1 100644 --- a/src/gba/core.c +++ b/src/gba/core.c @@ -535,7 +535,7 @@ static void _GBACoreUnloadROM(struct mCore* core) { mCheatDeviceDestroy(gbacore->cheatDevice); gbacore->cheatDevice = NULL; } - return GBAUnloadROM(core->board); + GBAUnloadROM(core->board); } static void _GBACoreChecksum(const struct mCore* core, void* data, enum mCoreChecksumType type) { diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 107761d8c..5340dc482 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -117,9 +117,6 @@ if(NOT WIN32) else() set_target_properties(${BINARY_NAME}-sdl PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") endif() -if (WIN32 AND MSVC) - set_target_properties(${BINARY_NAME}-sdl PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") -endif() install(TARGETS ${BINARY_NAME}-sdl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-sdl) if(UNIX) install(FILES ${CMAKE_SOURCE_DIR}/doc/mgba.6 DESTINATION ${MANDIR}/man6 COMPONENT ${BINARY_NAME}-sdl)