diff options
| author | 2021-06-22 08:39:28 -0700 | |
|---|---|---|
| committer | 2021-06-22 08:39:28 -0700 | |
| commit | 0e2c1a5739b1f27c62f198d21131a9619d4d9ddc (patch) | |
| tree | 7683b9b56f20083f0e1d69db1c841a3716937e5b | |
| parent | Merge pull request #6511 from ReinUsesLisp/core-is-powered-data-race (diff) | |
| parent | ci: windows: Copy the styles directory when packaging (diff) | |
| download | yuzu-0e2c1a5739b1f27c62f198d21131a9619d4d9ddc.tar.gz yuzu-0e2c1a5739b1f27c62f198d21131a9619d4d9ddc.tar.xz yuzu-0e2c1a5739b1f27c62f198d21131a9619d4d9ddc.zip | |
Merge pull request #6495 from lat9nq/mingw-vista-style
ci: windows: Copy the Qt styles directory when packaging
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index feba3fd6e..155d8a5c8 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -18,19 +18,20 @@ cd .. | |||
| 18 | mkdir package | 18 | mkdir package |
| 19 | 19 | ||
| 20 | if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then | 20 | if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then |
| 21 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/' | 21 | QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins' |
| 22 | else | 22 | else |
| 23 | #fallback to qt | 23 | #fallback to qt |
| 24 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/' | 24 | QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins' |
| 25 | fi | 25 | fi |
| 26 | 26 | ||
| 27 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; | 27 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; |
| 28 | 28 | ||
| 29 | # copy Qt plugins | 29 | # copy Qt plugins |
| 30 | mkdir package/platforms | 30 | mkdir package/platforms |
| 31 | cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/ | 31 | cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/ |
| 32 | cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/ | 32 | cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/ |
| 33 | cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/ | 33 | cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/ |
| 34 | cp -rv "${QT_PLUGINS_PATH}/styles/" package/ | ||
| 34 | rm -f package/mediaservice/*d.dll | 35 | rm -f package/mediaservice/*d.dll |
| 35 | 36 | ||
| 36 | for i in package/*.exe; do | 37 | for i in package/*.exe; do |