mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
CMake: make option ENABLE_SDL work again
Broken in PR #4755 / commit f978765
This commit is contained in:
parent
bdf09c7d3b
commit
fc0d88817f
@ -51,27 +51,29 @@ if(UNIX)
|
||||
set(SRCS ${SRCS} ControllerInterface/Pipes/Pipes.cpp)
|
||||
endif()
|
||||
|
||||
find_package(SDL2)
|
||||
if(SDL2_FOUND)
|
||||
message(STATUS "Using shared SDL2")
|
||||
set(SDL_TARGET SDL2::SDL2)
|
||||
else()
|
||||
# SDL2 not found, try SDL
|
||||
find_package(SDL)
|
||||
if(SDL_FOUND)
|
||||
message(STATUS "Using shared SDL")
|
||||
add_library(System_SDL INTERFACE)
|
||||
target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR})
|
||||
target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY})
|
||||
set(SDL_TARGET System_SDL)
|
||||
if(ENABLE_SDL)
|
||||
find_package(SDL2)
|
||||
if(SDL2_FOUND)
|
||||
message(STATUS "Using shared SDL2")
|
||||
set(SDL_TARGET SDL2::SDL2)
|
||||
else()
|
||||
# SDL2 not found, try SDL
|
||||
find_package(SDL)
|
||||
if(SDL_FOUND)
|
||||
message(STATUS "Using shared SDL")
|
||||
add_library(System_SDL INTERFACE)
|
||||
target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR})
|
||||
target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY})
|
||||
set(SDL_TARGET System_SDL)
|
||||
endif()
|
||||
endif()
|
||||
if(SDL_TARGET AND TARGET ${SDL_TARGET})
|
||||
set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
|
||||
set(LIBS ${LIBS} ${SDL_TARGET})
|
||||
add_definitions(-DHAVE_SDL=1)
|
||||
else()
|
||||
message(STATUS "SDL NOT found, disabling SDL input")
|
||||
endif()
|
||||
endif()
|
||||
if(SDL_TARGET AND TARGET ${SDL_TARGET})
|
||||
set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
|
||||
set(LIBS ${LIBS} ${SDL_TARGET})
|
||||
add_definitions(-DHAVE_SDL=1)
|
||||
else()
|
||||
message(STATUS "SDL NOT found, disabling SDL input")
|
||||
endif()
|
||||
|
||||
add_dolphin_library(inputcommon "${SRCS}" "${LIBS}")
|
||||
|
Loading…
Reference in New Issue
Block a user