From e18137d6628203a1385c7db312914a7583636145 Mon Sep 17 00:00:00 2001 From: Wolfywolfy Date: Tue, 1 Oct 2024 21:18:28 -0300 Subject: [PATCH] [PS2SDK]: Remove ps2_drivers from ci. --- .github/workflows/ps2.yaml | 9 --------- CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ps2.yaml b/.github/workflows/ps2.yaml index 5235a09d1c4a6..a3ad4eddb1283 100644 --- a/.github/workflows/ps2.yaml +++ b/.github/workflows/ps2.yaml @@ -13,15 +13,6 @@ jobs: apk update 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 \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a9269a7e1399..595356f62d818 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2725,7 +2725,7 @@ elseif(PSP) endif() elseif(PS2) - list(APPEND EXTRA_CFLAGS "-DPS2" "-D__PS2__" "-I$ENV{PS2SDK}/ports/include" "-I$ENV{PS2DEV}/gsKit/include") + list(APPEND EXTRA_CFLAGS "-I$ENV{PS2DEV}/gsKit/include") file(GLOB PS2_MAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/ps2/*.c) set(SDLMAIN_SOURCES ${SDLMAIN_SOURCES} ${PS2_MAIN_SOURCES})