diff options
| author | Raphaël Zumer <rzumer@tebako.net> | 2020-07-31 16:34:28 -0400 |
|---|---|---|
| committer | Raphaël Zumer <rzumer@tebako.net> | 2020-07-31 16:50:19 -0400 |
| commit | 68e310e4ef971b42bb1ab4effd5c49ce1dd58c33 (patch) | |
| tree | ca9ff02a940ee2f33d19d2d0365cb7ef478c6198 | |
| parent | ce28d5725b079ee76d8a9af5c8a22eaa9fbbe78a (diff) | |
Deploy Qt libraries with dynamic Windows builds
Also stop using msys-dist.sh with the static CI build.
| -rw-r--r-- | .github/workflows/build-windows.yml | 5 | ||||
| -rwxr-xr-x | msys-dist.sh | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index bbf68af..569cebc 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -36,9 +36,8 @@ jobs: - name: Make run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ - && cd melonDS/build && make -j$(nproc --all) \ - && ../msys-dist.sh" + && cd melonDS/build && make -j$(nproc --all)" - uses: actions/upload-artifact@v1 with: name: melonDS - path: C:\tools\msys64\home\runneradmin\melonDS\build\dist + path: C:\tools\msys64\home\runneradmin\melonDS\build\melonDS.exe diff --git a/msys-dist.sh b/msys-dist.sh index 87c9d7e..d95a6d3 100755 --- a/msys-dist.sh +++ b/msys-dist.sh @@ -11,4 +11,5 @@ for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); d cp "${lib}" dist done -cp melonDS.exe dist
\ No newline at end of file +cp melonDS.exe dist +windeployqt dist |