diff --git a/src/Joystick/CMakeLists.txt b/src/Joystick/CMakeLists.txt index 2024dcd98ed43ab00aea200dd0b2b152fa746cf2..f7536972b596903d7fa0c2b60b624923d98a9c79 100644 --- a/src/Joystick/CMakeLists.txt +++ b/src/Joystick/CMakeLists.txt @@ -24,24 +24,7 @@ target_link_libraries(Joystick target_include_directories(Joystick PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -if(LINUX) - find_package(SDL2 REQUIRED) - if (IS_DIRECTORY ${SDL2_INCLUDE_DIRS}) - include_directories(${SDL2_INCLUDE_DIRS}) - string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) - target_link_libraries(Joystick PRIVATE ${SDL2_LIBRARIES}) - else() - include_directories(${SDL2_DIR}) - target_link_libraries(Joystick PRIVATE SDL2::SDL2) - endif() - -elseif(APPLE) - include_directories(${CMAKE_SOURCE_DIR}/libs/lib/Frameworks/SDL2.framework/Headers) - target_link_libraries(Joystick PRIVATE -F${CMAKE_SOURCE_DIR}/libs/lib/Frameworks "-framework SDL2") - set_target_properties(Joystick PROPERTIES - MACOSX_BUNDLE YES - ) -elseif(WIN32) +if(WIN32) include_directories(libs/lib/sdl2/msvc/include) # Support both 32 and 64 bit builds if (${CMAKE_SIZEOF_VOID_P} MATCHES 8) @@ -51,7 +34,16 @@ elseif(WIN32) endif () string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) - + target_link_libraries(Joystick ${SDL2_LIBRARIES}) +else() + find_package(SDL2 REQUIRED) + if (IS_DIRECTORY ${SDL2_INCLUDE_DIRS}) + include_directories(${SDL2_INCLUDE_DIRS}) + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + target_link_libraries(Joystick PRIVATE ${SDL2_LIBRARIES}) + else() + include_directories(${SDL2_DIR}) + target_link_libraries(Joystick PRIVATE SDL2::SDL2) + endif() endif() -