diff options
| author | Michael M <mchtly@gmail.com> | 2017-11-09 13:52:33 -0800 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2018-06-04 17:49:21 +0200 |
| commit | 0eb47e1071b2e2e5fb18beddc5c4f16ddbfee609 (patch) | |
| tree | 91069a07741d37b372897af238405af9936cbbe9 /Source | |
| parent | 8e0ea92ec35a0473e79ef012b9f98b7a38d3ef33 (diff) | |
CMake: make SDL a private dep of InputCommon
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/InputCommon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index b79d9fef19..99cf2f9679 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -114,8 +114,8 @@ if(ENABLE_SDL) endif() if(SDL_TARGET AND TARGET ${SDL_TARGET}) target_sources(inputcommon PRIVATE ControllerInterface/SDL/SDL.cpp) - target_link_libraries(inputcommon PUBLIC ${SDL_TARGET}) - target_compile_definitions(inputcommon PRIVATE -DHAVE_SDL=1) + target_link_libraries(inputcommon PRIVATE ${SDL_TARGET}) + target_compile_definitions(inputcommon PRIVATE "CIFACE_USE_SDL=1") else() message(STATUS "SDL NOT found, disabling SDL input") endif() diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 06fd7c544d..c576b20fb3 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -23,9 +23,6 @@ #if defined(__APPLE__) #define CIFACE_USE_OSX #endif -#if defined(HAVE_SDL) && HAVE_SDL -#define CIFACE_USE_SDL -#endif #if defined(HAVE_LIBEVDEV) && defined(HAVE_LIBUDEV) #define CIFACE_USE_EVDEV #endif |