From 1f3ae75228e46d440e98bc13bbb8ffcfafcee920 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Sat, 18 Jun 2022 11:54:23 +0200 Subject: [PATCH] Add ps2_drivers dependency Fix CI --- .github/workflows/ps2.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ps2.yaml b/.github/workflows/ps2.yaml index a8f9ce2cb..4140b0926 100644 --- a/.github/workflows/ps2.yaml +++ b/.github/workflows/ps2.yaml @@ -11,7 +11,17 @@ jobs: - name: Setup dependencies run: | apk update - apk add cmake gmp mpc1 mpfr4 ninja pkgconf + apk add cmake gmp mpc1 mpfr4 ninja pkgconf make git + + # To be removed once ps2_drivers is part of PS2DEV + - name: Install ps2_drivers lib + run: | + git clone https://github.com/fjtrujy/ps2_drivers.git + cd ps2_drivers + make -j $(getconf _NPROCESSORS_ONLN) clean + make -j $(getconf _NPROCESSORS_ONLN) + make -j $(getconf _NPROCESSORS_ONLN) install + - name: Configure (CMake) run: | cmake -S . -B build -G Ninja\ @@ -40,10 +50,12 @@ jobs: run: | export CC=mips64r5900el-ps2-elf-gcc export PATH=${{ env.SDL2_DIR }}/bin:$PATH + export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/ps2sdk/ports/lib" cmake/test/test_sdlconfig.sh - name: Verify sdl2.pc run: | export CC=mips64r5900el-ps2-elf-gcc + export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/ps2sdk/ports/lib" export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig cmake/test/test_pkgconfig.sh