Merge pull request #10840 from AdmiralCurtiss/cmake-windows-sdl

Fix CMake Windows build after SDL merge.

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)

Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp

@@ -16,8 +16,6 @@
 
 #ifdef _WIN32
 #include <Windows.h>
-
-#pragma comment(lib, "SDL2.lib")
 #endif
 
 namespace ciface::SDL