summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-27 21:38:49 -0700
committerGravatar Yuri Kunde Schlesner2017-05-27 21:38:49 -0700
commit776cb917850c9d36ffd886de2dc93f6b42b879db (patch)
tree7b5b17b1b7f7543ae7e8bd424cb968e72134e9b8 /src
parentCMake: Remove CITRA_QT_LIBS var (diff)
downloadyuzu-776cb917850c9d36ffd886de2dc93f6b42b879db.tar.gz
yuzu-776cb917850c9d36ffd886de2dc93f6b42b879db.tar.xz
yuzu-776cb917850c9d36ffd886de2dc93f6b42b879db.zip
CMake: Define an interface target for SDL2 definitions
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/CMakeLists.txt3
-rw-r--r--src/citra/CMakeLists.txt6
-rw-r--r--src/input_common/CMakeLists.txt3
3 files changed, 4 insertions, 8 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index c571213fc..ecd3025cc 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -32,7 +32,6 @@ include_directories(../../externals/soundtouch/include)
32if(SDL2_FOUND) 32if(SDL2_FOUND)
33 set(SRCS ${SRCS} sdl2_sink.cpp) 33 set(SRCS ${SRCS} sdl2_sink.cpp)
34 set(HEADERS ${HEADERS} sdl2_sink.h) 34 set(HEADERS ${HEADERS} sdl2_sink.h)
35 include_directories(${SDL2_INCLUDE_DIR})
36endif() 35endif()
37 36
38create_directory_groups(${SRCS} ${HEADERS}) 37create_directory_groups(${SRCS} ${HEADERS})
@@ -42,6 +41,6 @@ target_link_libraries(audio_core PUBLIC common core)
42target_link_libraries(audio_core PRIVATE SoundTouch) 41target_link_libraries(audio_core PRIVATE SoundTouch)
43 42
44if(SDL2_FOUND) 43if(SDL2_FOUND)
45 target_link_libraries(audio_core PRIVATE ${SDL2_LIBRARY}) 44 target_link_libraries(audio_core PRIVATE SDL2)
46 target_compile_definitions(audio_core PRIVATE HAVE_SDL2) 45 target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
47endif() 46endif()
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index f6f2e8e91..d72d2b5f4 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -15,15 +15,13 @@ set(HEADERS
15 15
16create_directory_groups(${SRCS} ${HEADERS}) 16create_directory_groups(${SRCS} ${HEADERS})
17 17
18include_directories(${SDL2_INCLUDE_DIR})
19
20add_executable(citra ${SRCS} ${HEADERS}) 18add_executable(citra ${SRCS} ${HEADERS})
21target_link_libraries(citra PRIVATE common core input_common) 19target_link_libraries(citra PRIVATE common core input_common)
22target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} inih glad) 20target_link_libraries(citra PRIVATE inih glad)
23if (MSVC) 21if (MSVC)
24 target_link_libraries(citra PRIVATE getopt) 22 target_link_libraries(citra PRIVATE getopt)
25endif() 23endif()
26target_link_libraries(citra PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) 24target_link_libraries(citra PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
27 25
28if(UNIX AND NOT APPLE) 26if(UNIX AND NOT APPLE)
29 install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 27 install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 5b306e42e..e3e36ada7 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -13,7 +13,6 @@ set(HEADERS
13if(SDL2_FOUND) 13if(SDL2_FOUND)
14 set(SRCS ${SRCS} sdl/sdl.cpp) 14 set(SRCS ${SRCS} sdl/sdl.cpp)
15 set(HEADERS ${HEADERS} sdl/sdl.h) 15 set(HEADERS ${HEADERS} sdl/sdl.h)
16 include_directories(${SDL2_INCLUDE_DIR})
17endif() 16endif()
18 17
19create_directory_groups(${SRCS} ${HEADERS}) 18create_directory_groups(${SRCS} ${HEADERS})
@@ -22,6 +21,6 @@ add_library(input_common STATIC ${SRCS} ${HEADERS})
22target_link_libraries(input_common PUBLIC core PRIVATE common) 21target_link_libraries(input_common PUBLIC core PRIVATE common)
23 22
24if(SDL2_FOUND) 23if(SDL2_FOUND)
25 target_link_libraries(input_common PRIVATE ${SDL2_LIBRARY}) 24 target_link_libraries(input_common PRIVATE SDL2)
26 target_compile_definitions(input_common PRIVATE HAVE_SDL2) 25 target_compile_definitions(input_common PRIVATE HAVE_SDL2)
27endif() 26endif()