diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 6 |
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 @@ | |||
| 1 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||
| 2 | |||
| 1 | set(SRCS | 3 | set(SRCS |
| 2 | emu_window/emu_window_sdl2.cpp | 4 | emu_window/emu_window_sdl2.cpp |
| 3 | citra.cpp | 5 | citra.cpp |
| @@ -28,11 +30,6 @@ if(UNIX AND NOT APPLE) | |||
| 28 | endif() | 30 | endif() |
| 29 | 31 | ||
| 30 | if (MSVC) | 32 | if (MSVC) |
| 31 | include(WindowsCopyFiles) | 33 | include(CopyCitraSDLDeps) |
| 32 | 34 | copy_citra_SDL_deps(citra) | |
| 33 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | ||
| 34 | |||
| 35 | windows_copy_files(citra ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) | ||
| 36 | |||
| 37 | unset(DLL_DEST) | ||
| 38 | endif() | 35 | 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) | |||
| 108 | install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | 108 | install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") |
| 109 | endif() | 109 | endif() |
| 110 | 110 | ||
| 111 | include(CopyMSVCLibsQt) | ||
| 112 | if (MSVC) | 111 | if (MSVC) |
| 113 | copy_msvc_libraries() | 112 | include(CopyCitraQt5Deps) |
| 113 | include(CopyCitraSDLDeps) | ||
| 114 | copy_citra_Qt5_deps(citra-qt) | ||
| 115 | copy_citra_SDL_deps(citra-qt) | ||
| 114 | endif() | 116 | endif() |