Просмотр исходного кода

[MSVC] Copy SDL2.dll to build folder

CMake now copies SDL2.dll when compiling citra with citra-qt as a target
on MSVC.
freiro 9 лет назад
Родитель
Сommit
143bc8713d
1 измененных файлов с 20 добавлено и 20 удалено
  1. 20 20
      src/citra_qt/CMakeLists.txt

+ 20 - 20
src/citra_qt/CMakeLists.txt

@@ -107,27 +107,27 @@ if(UNIX AND NOT APPLE)
     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 endif()
 endif()
 
 
-if (Qt5_FOUND AND MSVC)
+if (MSVC)
     include(WindowsCopyFiles)
     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(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(DLL_DEST)
-    unset(PLATFORMS)
 endif()
 endif()