diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 3 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index ed24c742c..e4a9796c8 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -3,7 +3,9 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 4 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | 4 | set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") |
| 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | 5 | set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") |
| 6 | set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") | ||
| 6 | set(PLATFORMS ${DLL_DEST}platforms/) | 7 | set(PLATFORMS ${DLL_DEST}platforms/) |
| 8 | set(STYLES ${DLL_DEST}styles/) | ||
| 7 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} | 9 | windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} |
| 8 | icudt*.dll | 10 | icudt*.dll |
| 9 | icuin*.dll | 11 | icuin*.dll |
| @@ -14,4 +16,5 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 14 | Qt5Widgets$<$<CONFIG:Debug>:d>.* | 16 | Qt5Widgets$<$<CONFIG:Debug>:d>.* |
| 15 | ) | 17 | ) |
| 16 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) | 18 | windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) |
| 19 | windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*) | ||
| 17 | endfunction(copy_yuzu_Qt5_deps) | 20 | endfunction(copy_yuzu_Qt5_deps) |
diff --git a/appveyor.yml b/appveyor.yml index 72cda26a7..17d1b5fee 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -116,6 +116,7 @@ after_build: | |||
| 116 | 116 | ||
| 117 | mkdir $RELEASE_DIST | 117 | mkdir $RELEASE_DIST |
| 118 | mkdir $RELEASE_DIST/platforms | 118 | mkdir $RELEASE_DIST/platforms |
| 119 | mkdir $RELEASE_DIST/styles | ||
| 119 | 120 | ||
| 120 | # copy the compiled binaries and other release files to the release folder | 121 | # copy the compiled binaries and other release files to the release folder |
| 121 | Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST | 122 | Get-ChildItem "$CMAKE_BINARY_DIR" -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST |
| @@ -136,6 +137,9 @@ after_build: | |||
| 136 | # copy the qt windows plugin dll to platforms | 137 | # copy the qt windows plugin dll to platforms |
| 137 | Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms" | 138 | Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/platforms/qwindows.dll" -force -destination "$RELEASE_DIST/platforms" |
| 138 | 139 | ||
| 140 | # copy the qt windows vista style dll to platforms | ||
| 141 | Copy-Item -path "C:/msys64/mingw64/share/qt5/plugins/styles/qwindowsvistastyle.dll" -force -destination "$RELEASE_DIST/styles" | ||
| 142 | |||
| 139 | 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* | 143 | 7z a -tzip $MINGW_BUILD_ZIP $RELEASE_DIST\* |
| 140 | 7z a $MINGW_SEVENZIP $RELEASE_DIST | 144 | 7z a $MINGW_SEVENZIP $RELEASE_DIST |
| 141 | } | 145 | } |