diff options
| author | freiro <f73b2894@opayq.com> | 2016-12-13 00:01:48 +0100 |
|---|---|---|
| committer | freiro <f73b2894@opayq.com> | 2016-12-13 21:05:00 +0100 |
| commit | b7b2627b3746e28fe64c9af74583c8b24edee909 (patch) | |
| tree | 8edfeefdfdcdd595ca0d2499e83db64e1c81ebc0 | |
| parent | Modularization of copy_msvc_libraries cmake funct (diff) | |
| download | yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.gz yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.bz2 yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.lz yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.xz yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.zst yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.zip | |
| -rw-r--r-- | CMakeModules/CopyCitraQt5Deps.cmake (renamed from CMakeModules/CopyMSVCLibsQt.cmake) | 8 | ||||
| -rw-r--r-- | CMakeModules/CopyCitraSDLDeps.cmake | 5 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 6 |
4 files changed, 16 insertions, 14 deletions
diff --git a/CMakeModules/CopyMSVCLibsQt.cmake b/CMakeModules/CopyCitraQt5Deps.cmake index 64b27a807..05f58cf9a 100644 --- a/CMakeModules/CopyMSVCLibsQt.cmake +++ b/CMakeModules/CopyCitraQt5Deps.cmake @@ -1,12 +1,10 @@ -function(copy_msvc_libraries) +function(copy_citra_Qt5_deps target_dir) include(WindowsCopyFiles) set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") - windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) - set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") set(PLATFORMS ${DLL_DEST}platforms/) - windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST} + windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll icuuc*.dll @@ -16,4 +14,4 @@ function(copy_msvc_libraries) Qt5Widgets$<$<CONFIG:Debug>:d>.* ) windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) -endfunction(copy_msvc_libraries)
\ No newline at end of file +endfunction(copy_citra_Qt5_deps) diff --git a/CMakeModules/CopyCitraSDLDeps.cmake b/CMakeModules/CopyCitraSDLDeps.cmake new file mode 100644 index 000000000..4f9e4aeb9 --- /dev/null +++ b/CMakeModules/CopyCitraSDLDeps.cmake @@ -0,0 +1,5 @@ +function(copy_citra_SDL_deps target_dir) + include(WindowsCopyFiles) + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) +endfunction(copy_citra_SDL_deps) diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index f9c488a1a..ecb5d2dfe 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -1,3 +1,5 @@ +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) + set(SRCS emu_window/emu_window_sdl2.cpp citra.cpp @@ -28,11 +30,6 @@ if(UNIX AND NOT APPLE) endif() if (MSVC) - include(WindowsCopyFiles) - - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") - - windows_copy_files(citra ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) - - unset(DLL_DEST) + include(CopyCitraSDLDeps) + copy_citra_SDL_deps(citra) endif() diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 64c4330c1..e1b3566bf 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -108,7 +108,9 @@ if(UNIX AND NOT APPLE) install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -include(CopyMSVCLibsQt) if (MSVC) - copy_msvc_libraries() + include(CopyCitraQt5Deps) + include(CopyCitraSDLDeps) + copy_citra_Qt5_deps(citra-qt) + copy_citra_SDL_deps(citra-qt) endif() |