diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-05-29 22:00:31 +0200 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-05-29 22:00:31 +0200 |
| commit | 054b94b2b759abefead466242dd350bc210e4e6b (patch) | |
| tree | 8e8a12c3e8d3902c88fa465e7983bba8edf61c31 /.github/workflows | |
| parent | 0cadd4bd12bc824d010396c855fa450774e6f619 (diff) | |
fix the Github Actions shit, hopefully
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build-windows.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index b57c5b7..6071e33 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -27,7 +27,7 @@ jobs: && tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ && sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \ && sudo apt-get update \ - && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev + && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure 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`" \ |