summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorGravatar lat9nq2021-06-19 05:24:56 -0400
committerGravatar lat9nq2021-06-19 05:24:56 -0400
commitad8aab915b3dd0de1e809590737974f75ba25ba7 (patch)
tree89883083ff409fd6fa60183f01724a85399692b1 /.ci
parentMerge pull request #6494 from lat9nq/mingw-fix-fastmem (diff)
downloadyuzu-ad8aab915b3dd0de1e809590737974f75ba25ba7.tar.gz
yuzu-ad8aab915b3dd0de1e809590737974f75ba25ba7.tar.xz
yuzu-ad8aab915b3dd0de1e809590737974f75ba25ba7.zip
ci: windows: Copy the styles directory when packaging
Qt can make use of qwindowsvistastyle.dll if present, and our MinGW container has the library, but it was not being copied during the packaging process. Thus, yuzu looked like a Windows 98 application when using the PR-verify artifacts. This copies over the DLL during packaging, for that sweet-sweet Windows Vista style. In addition, set the Qt plugins path instead of the plugins/platforms path. This way we can use the directory directly, rather than appending a `..` everytime we need something just outside of it.
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/scripts/windows/docker.sh11
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 ..
18mkdir package 18mkdir package
19 19
20if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then 20if [ -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'
22else 22else
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'
25fi 25fi
26 26
27find build/ -name "yuzu*.exe" -exec cp {} 'package' \; 27find build/ -name "yuzu*.exe" -exec cp {} 'package' \;
28 28
29# copy Qt plugins 29# copy Qt plugins
30mkdir package/platforms 30mkdir package/platforms
31cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/ 31cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/
32cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/ 32cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/
33cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/ 33cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/
34cp -rv "${QT_PLUGINS_PATH}/styles/" package/
34rm -f package/mediaservice/*d.dll 35rm -f package/mediaservice/*d.dll
35 36
36for i in package/*.exe; do 37for i in package/*.exe; do