diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-07-27 16:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 16:01:55 +0200 |
| commit | dff14ca80ada883870131c7ff17d85866254ccc0 (patch) | |
| tree | c15926879ed78d68d313c75e4cb7d764cb4c1fea /src/frontend/qt_sdl/CMakeLists.txt | |
| parent | 17ce4d2a73770ecd8c5f0ff036636b5453cb86c9 (diff) | |
| parent | 6a682a8ef0d1cc3aa35eaa70c4f7a7d106b25b06 (diff) | |
Merge pull request #682 from nadiaholmquist/slirp-merge
Merge slirp branch into master
Diffstat (limited to 'src/frontend/qt_sdl/CMakeLists.txt')
| -rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index ea7849f..05c42d1 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -46,7 +46,9 @@ set(CMAKE_AUTORCC ON) find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) +find_package(Iconv REQUIRED) pkg_check_modules(SDL2 REQUIRED sdl2) +pkg_check_modules(SLIRP REQUIRED slirp) if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL Release)) add_executable(melonDS WIN32 ${SOURCES_QT_SDL}) @@ -57,15 +59,20 @@ endif() target_link_libraries(melonDS ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS}) +target_include_directories(melonDS PRIVATE ${SLIRP_INCLUDE_DIRS}) target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..") target_link_libraries(melonDS core) if (BUILD_STATIC) - target_link_libraries(melonDS -static ${SDL2_LIBRARIES}) + target_link_libraries(melonDS -static ${SDL2_STATIC_LIBRARIES} ${SLIRP_STATIC_LIBRARIES}) else() - target_link_libraries(melonDS ${SDL2_LIBRARIES}) + target_link_libraries(melonDS ${SDL2_LIBRARIES} ${SLIRP_LIBRARIES}) +endif() + +if (NOT Iconv_IS_BUILT_IN) + target_link_libraries(melonDS iconv) endif() if (UNIX) |