summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar freiro2016-12-11 11:49:22 +0100
committerGravatar freiro2016-12-11 12:22:37 +0100
commit143bc8713d25a143607366a2b760db86c25acc12 (patch)
tree5d6ee169cfe02e775f73b64fb0671e69174fde1c /src
parentMerge pull request #2300 from lioncash/qt (diff)
downloadyuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.gz
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.xz
yuzu-143bc8713d25a143607366a2b760db86c25acc12.zip
[MSVC] Copy SDL2.dll to build folder
CMake now copies SDL2.dll when compiling citra with citra-qt as a target on MSVC.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/CMakeLists.txt40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index a9dacd5f1..495a9d780 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -107,27 +107,27 @@ if(UNIX AND NOT APPLE)
107 install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 107 install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
108endif() 108endif()
109 109
110if (Qt5_FOUND AND MSVC) 110if (MSVC)
111 include(WindowsCopyFiles) 111 include(WindowsCopyFiles)
112
113 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
114 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
115 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") 112 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
116 set(PLATFORMS ${DLL_DEST}platforms/) 113 windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
117 114 if (Qt5_FOUND)
118 windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST} 115 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
119 icudt*.dll 116 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
120 icuin*.dll 117 set(PLATFORMS ${DLL_DEST}platforms/)
121 icuuc*.dll 118 windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST}
122 Qt5Core$<$<CONFIG:Debug>:d>.* 119 icudt*.dll
123 Qt5Gui$<$<CONFIG:Debug>:d>.* 120 icuin*.dll
124 Qt5OpenGL$<$<CONFIG:Debug>:d>.* 121 icuuc*.dll
125 Qt5Widgets$<$<CONFIG:Debug>:d>.* 122 Qt5Core$<$<CONFIG:Debug>:d>.*
126 ) 123 Qt5Gui$<$<CONFIG:Debug>:d>.*
127 windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) 124 Qt5OpenGL$<$<CONFIG:Debug>:d>.*
128 125 Qt5Widgets$<$<CONFIG:Debug>:d>.*
129 unset(Qt5_DLL_DIR) 126 )
130 unset(Qt5_PLATFORMS_DIR) 127 windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
128 unset(Qt5_DLL_DIR)
129 unset(Qt5_PLATFORMS_DIR)
130 unset(PLATFORMS)
131 endif()
131 unset(DLL_DEST) 132 unset(DLL_DEST)
132 unset(PLATFORMS)
133endif() 133endif()