The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix CMake Windows build after SDL merge.
This commit is contained in:
Admiral H. Curtiss 2022-07-14 19:05:25 +02:00 committed by GitHub
commit a739f63d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -619,11 +619,23 @@ if(ENABLE_SDL)
message(STATUS "Using system SDL2") message(STATUS "Using system SDL2")
else() else()
message(STATUS "Using static SDL2 from Externals") 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 OFF)
set(SDL_SHARED_ENABLED_BY_DEFAULT OFF) set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
set(SDL_STATIC ON) set(SDL_STATIC ON)
set(SDL_STATIC_ENABLED_BY_DEFAULT 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) 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) set(SDL2_FOUND TRUE)
endif() endif()
add_definitions(-DHAVE_SDL2=1) add_definitions(-DHAVE_SDL2=1)

2
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

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