diff options
| author | 2020-05-02 01:36:26 -0400 | |
|---|---|---|
| committer | 2020-05-02 01:36:26 -0400 | |
| commit | 02910953d3eac7c1fa315332a9af8afc6511b46e (patch) | |
| tree | 57cb68b5e7ee7dda6f18cc49bcc2729b2dab7aaa | |
| parent | Merge pull request #3809 from ReinUsesLisp/empty-index (diff) | |
| parent | Fixed packaging on some systems with different QT5 path (diff) | |
| download | yuzu-02910953d3eac7c1fa315332a9af8afc6511b46e.tar.gz yuzu-02910953d3eac7c1fa315332a9af8afc6511b46e.tar.xz yuzu-02910953d3eac7c1fa315332a9af8afc6511b46e.zip | |
Merge pull request #3775 from gxcreator/qt5-path-fix
Fixed packaging on some systems with different QT5 path
| -rwxr-xr-x[-rw-r--r--] | .ci/scripts/windows/docker.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index beb554b65..a55541e10 100644..100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -29,7 +29,13 @@ echo 'Prepare binaries...' | |||
| 29 | cd .. | 29 | cd .. |
| 30 | mkdir package | 30 | mkdir package |
| 31 | 31 | ||
| 32 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/' | 32 | if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then |
| 33 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/' | ||
| 34 | else | ||
| 35 | #fallback to qt | ||
| 36 | QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/' | ||
| 37 | fi | ||
| 38 | |||
| 33 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; | 39 | find build/ -name "yuzu*.exe" -exec cp {} 'package' \; |
| 34 | 40 | ||
| 35 | # copy Qt plugins | 41 | # copy Qt plugins |