From: Paul Cercueil Date: Fri, 3 Jun 2022 17:26:28 +0000 (+0100) Subject: CI: Pass SDL_CONFIG to the ./configure script X-Git-Tag: r24~356 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2bbb7d055e9a403bdcde044be8762be57f49b12;p=pcsx_rearmed.git CI: Pass SDL_CONFIG to the ./configure script Signed-off-by: Paul Cercueil --- diff --git a/.github/workflows/ci-linux-arm64.yml b/.github/workflows/ci-linux-arm64.yml index de2f84ce..1666b976 100644 --- a/.github/workflows/ci-linux-arm64.yml +++ b/.github/workflows/ci-linux-arm64.yml @@ -17,6 +17,6 @@ jobs: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu .github/extract-foreign-all.sh arm64 - name: configure - run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=aarch64-linux-gnu- PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/aarch64-linux-gnu/ -Llib/aarch64-linux-gnu/ -Wl,-rpath-link=lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/pulseaudio/' ./configure + run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=aarch64-linux-gnu- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/aarch64-linux-gnu/ -Llib/aarch64-linux-gnu/ -Wl,-rpath-link=lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/pulseaudio/' ./configure - name: make run: make diff --git a/.github/workflows/ci-linux-armhf.yml b/.github/workflows/ci-linux-armhf.yml index 0842bf36..50858959 100644 --- a/.github/workflows/ci-linux-armhf.yml +++ b/.github/workflows/ci-linux-armhf.yml @@ -17,6 +17,6 @@ jobs: sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf .github/extract-foreign-all.sh armhf - name: configure - run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=arm-linux-gnueabihf- PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/arm-linux-gnueabihf/ -Llib/arm-linux-gnueabihf/ -Wl,-rpath-link=lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/pulseaudio/' ./configure + run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=arm-linux-gnueabihf- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/arm-linux-gnueabihf/ -Llib/arm-linux-gnueabihf/ -Wl,-rpath-link=lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/pulseaudio/' ./configure - name: make run: make