From 992e38199aad3c6e7b0d35360332e4dedaa9712b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 30 Dec 2020 17:18:53 -0800 Subject: [PATCH] Build: Install SDL2 dependency. --- .github/workflows/build.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4d7fa1259..0f3786f52f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,11 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: Build Windows - working-directory: ${{env.GITHUB_WORKSPACE}} - run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} Windows/PPSSPP.sln + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ env.BUILD_PLATFORM }} Windows/PPSSPP.sln - name: Package build - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ env.GITHUB_WORKSPACE }} run: | mkdir ppsspp cp PPSSPP*.exe ppsspp/ @@ -64,8 +64,8 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: Build UWP - working-directory: ${{env.GITHUB_WORKSPACE}} - run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /p:AppxPackageSigningEnabled=false UWP/PPSSPP_UWP.sln + working-directory: ${{ env.GITHUB_WORKSPACE }} + run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ env.BUILD_PLATFORM }} /p:AppxPackageSigningEnabled=false UWP/PPSSPP_UWP.sln test-windows: runs-on: windows-latest @@ -77,7 +77,7 @@ jobs: submodules: false - name: Fetch tests - working-directory: ${{env.GITHUB_WORKSPACE}} + working-directory: ${{ env.GITHUB_WORKSPACE }} # Doing this to avoid ffmpeg and other large submodules. run: git submodule update --init pspautotests assets/lang @@ -90,7 +90,7 @@ jobs: - name: Execute tests run: python test.py --graphics=software - build-cmake: + build: strategy: matrix: include: @@ -126,8 +126,8 @@ jobs: - os: ubuntu-latest cc: clang cxx: clang++ - android: true args: ./b.sh --libretro_android ppsspp_libretro + android: true - os: ubuntu-latest cc: gcc @@ -160,7 +160,19 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 - if: ${{matrix.qt}} == 'true' + if: matrix.qt == 'true' + + - name: Install Linux dependencies + if: runner.os == 'Linux' + run: | + sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" + sudo apt-get update -y -qq + sudo apt-get install libsdl2-dev libgl1-mesa-dev libglu1-mesa-dev + + - name: Install macOS dependencies + if: runner.os == 'macOS' + run: | + brew install sdl2 - name: Execute build env: