diff --git a/CMakeLists.txt b/CMakeLists.txt index 1346b6da95..91f41c2942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -619,11 +619,23 @@ if(ENABLE_SDL) message(STATUS "Using system SDL2") else() message(STATUS "Using static SDL2 from Externals") + option(SDL2_DISABLE_SDL2MAIN "" ON) + option(SDL2_DISABLE_INSTALL "" ON) + option(SDL2_DISABLE_UNINSTALL "" ON) set(SDL_SHARED OFF) set(SDL_SHARED_ENABLED_BY_DEFAULT OFF) set(SDL_STATIC ON) set(SDL_STATIC_ENABLED_BY_DEFAULT ON) + set(SDL_TEST OFF) + set(SDL_TEST_ENABLED_BY_DEFAULT OFF) + set(OPT_DEF_LIBC ON) add_subdirectory(Externals/SDL/SDL) + if (TARGET SDL2) + dolphin_disable_warnings_msvc(SDL2) + endif() + if (TARGET SDL2-static) + dolphin_disable_warnings_msvc(SDL2-static) + endif() set(SDL2_FOUND TRUE) endif() add_definitions(-DHAVE_SDL2=1) diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 6dec6003fd..0d7494142d 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -16,8 +16,6 @@ #ifdef _WIN32 #include - -#pragma comment(lib, "SDL2.lib") #endif namespace ciface::SDL