summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/citra/CMakeLists.txt11
-rw-r--r--src/citra_qt/CMakeLists.txt6
2 files changed, 8 insertions, 9 deletions
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()