summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfreiro <f73b2894@opayq.com>2016-12-11 11:49:22 +0100
committerfreiro <f73b2894@opayq.com>2016-12-11 12:22:37 +0100
commit143bc8713d25a143607366a2b760db86c25acc12 (patch)
tree5d6ee169cfe02e775f73b64fb0671e69174fde1c /src
parentMerge pull request #2300 from lioncash/qt (diff)
downloadyuzu-143bc8713d25a143607366a2b760db86c25acc12.tar
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.gz
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.bz2
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.lz
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.xz
yuzu-143bc8713d25a143607366a2b760db86c25acc12.tar.zst
yuzu-143bc8713d25a143607366a2b760db86c25acc12.zip
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)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif()
-if (Qt5_FOUND AND MSVC)
+if (MSVC)
include(WindowsCopyFiles)
-
- set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
- set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
- set(PLATFORMS ${DLL_DEST}platforms/)
-
- windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST}
- icudt*.dll
- icuin*.dll
- icuuc*.dll
- Qt5Core$<$<CONFIG:Debug>:d>.*
- Qt5Gui$<$<CONFIG:Debug>:d>.*
- Qt5OpenGL$<$<CONFIG:Debug>:d>.*
- Qt5Widgets$<$<CONFIG:Debug>:d>.*
- )
- windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
-
- unset(Qt5_DLL_DIR)
- unset(Qt5_PLATFORMS_DIR)
+ windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
+ if (Qt5_FOUND)
+ 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}
+ icudt*.dll
+ icuin*.dll
+ icuuc*.dll
+ Qt5Core$<$<CONFIG:Debug>:d>.*
+ Qt5Gui$<$<CONFIG:Debug>:d>.*
+ Qt5OpenGL$<$<CONFIG:Debug>:d>.*
+ Qt5Widgets$<$<CONFIG:Debug>:d>.*
+ )
+ windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
+ unset(Qt5_DLL_DIR)
+ unset(Qt5_PLATFORMS_DIR)
+ unset(PLATFORMS)
+ endif()
unset(DLL_DEST)
- unset(PLATFORMS)
endif()