summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar bunnei2016-12-16 11:35:55 -0500
committerGravatar GitHub2016-12-16 11:35:55 -0500
commitd30d6f81aa2ef14a690d483c5b7e7487c71d1971 (patch)
tree4626053321537e40007b8bcd8170bd91caadb99b /src/citra
parentMerge pull request #2337 from lioncash/gdb (diff)
parentModularized Qt and SDL file copying (diff)
downloadyuzu-d30d6f81aa2ef14a690d483c5b7e7487c71d1971.tar.gz
yuzu-d30d6f81aa2ef14a690d483c5b7e7487c71d1971.tar.xz
yuzu-d30d6f81aa2ef14a690d483c5b7e7487c71d1971.zip
Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll
Copy SDL2.dll when compiling citra-qt with msvc
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/CMakeLists.txt11
1 files changed, 4 insertions, 7 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 @@
1set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
2
1set(SRCS 3set(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)
28endif() 30endif()
29 31
30if (MSVC) 32if (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)
38endif() 35endif()