diff options
| author | bunnei <bunneidev@gmail.com> | 2021-06-22 08:39:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 08:39:28 -0700 |
| commit | 0e2c1a5739b1f27c62f198d21131a9619d4d9ddc (patch) | |
| tree | 7683b9b56f20083f0e1d69db1c841a3716937e5b | |
| parent | 698add85413780d062039f2807953d17e56ac3ec (diff) | |
| parent | ad8aab915b3dd0de1e809590737974f75ba25ba7 (diff) | |
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 .. mkdir package if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then - QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/' + QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins' else #fallback to qt - QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/' + QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins' fi find build/ -name "yuzu*.exe" -exec cp {} 'package' \; # copy Qt plugins mkdir package/platforms -cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/ -cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/ -cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/ +cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/ +cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/ +cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/ +cp -rv "${QT_PLUGINS_PATH}/styles/" package/ rm -f package/mediaservice/*d.dll for i in package/*.exe; do |