diff options
| author | RSDuck <RSDuck@users.noreply.github.com> | 2020-05-12 16:07:28 +0200 |
|---|---|---|
| committer | RSDuck <rsduck@users.noreply.github.com> | 2020-06-16 12:06:42 +0200 |
| commit | e7d076403df7afd6dc8304196211b49e3ed7f464 (patch) | |
| tree | 1d5ff1e743839f271de77f8bd312c985033c6a89 /.github/workflows/build-windows.yml | |
| parent | 4cff4b52286a7d1a7e40817d52a5d271a937ddc2 (diff) | |
| parent | c17f7b100e36edb1c728dbf21c77f9484d1820c6 (diff) | |
Merge branch 'generic_jit' of https://github.com/Arisotura/melonDS into generic_jit
Diffstat (limited to '.github/workflows/build-windows.yml')
| -rw-r--r-- | .github/workflows/build-windows.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index ec14e30..b8e8b04 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -25,7 +25,7 @@ jobs: 7z x -y msys64.7z "-oC:\tools\" C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm" - name: Install dependencies - run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}" - name: Create build environment run: | New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build @@ -33,7 +33,7 @@ jobs: - name: Configure run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ - && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}" + && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DQT5_STATIC_DIR=C:/tools/msys64/mingw64/qt5-static" - name: Make run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ |