eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: replace references to SDL2 with SDL3

Browse source
This commit is contained in:
Anonymous Maarten 2022-11-22 06:36:19 +01:00
parent 1b9c4c5ca1
commit ea21628045
10 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/android.yml vendored
View file

@ -50,7 +50,7 @@ jobs:
if: ${{ matrix.platform.name == 'CMake' }} if: ${{ matrix.platform.name == 'CMake' }}
run: | run: |
cmake --install build --config Release cmake --install build --config Release
echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
( cd prefix; find ) | LC_ALL=C sort -u ( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
if: ${{ matrix.platform.name == 'CMake' }} if: ${{ matrix.platform.name == 'CMake' }}
@ -60,22 +60,22 @@ jobs:
-DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \ -DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \
-DANDROID_ABI=${{ matrix.platform.android_abi }} \ -DANDROID_ABI=${{ matrix.platform.android_abi }} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
- name: Verify sdl2-config - name: Verify sdl3-config
if: ${{ matrix.platform.name == 'CMake' }} if: ${{ matrix.platform.name == 'CMake' }}
run: | run: |
export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}"
export PATH=${{ env.SDL2_DIR }}/bin:$PATH export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh cmake/test/test_sdlconfig.sh
- name: Verify sdl2.pc - name: Verify sdl3.pc
if: ${{ matrix.platform.name == 'CMake' }} if: ${{ matrix.platform.name == 'CMake' }}
run: | run: |
export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}"
export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh cmake/test/test_pkgconfig.sh
- name: Verify Android.mk - name: Verify Android.mk
if: ${{ matrix.platform.name == 'CMake' }} if: ${{ matrix.platform.name == 'CMake' }}
run: | run: |
export NDK_MODULE_PATH=${{ env.SDL2_DIR }}/share/ndk-modules export NDK_MODULE_PATH=${{ env.SDL3_DIR }}/share/ndk-modules
ndk-build -C ${{ github.workspace }}/cmake/test APP_PLATFORM=android-${{ matrix.platform.android_platform }} APP_ABI=${{ matrix.platform.android_abi }} NDK_OUT=$PWD NDK_LIBS_OUT=$PWD V=1 ndk-build -C ${{ github.workspace }}/cmake/test APP_PLATFORM=android-${{ matrix.platform.android_platform }} APP_ABI=${{ matrix.platform.android_abi }} NDK_OUT=$PWD NDK_LIBS_OUT=$PWD V=1

4
.github/workflows/emscripten.yml vendored
View file

@ -33,7 +33,7 @@ jobs:
# ctest -VV --test-dir build/ # ctest -VV --test-dir build/
- name: Install - name: Install
run: | run: |
echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/ cmake --install build/
- name: Verify CMake configuration files - name: Verify CMake configuration files
run: | run: |
@ -41,5 +41,5 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DSDL_VENDOR_INFO="Github Workflow" \ -DSDL_VENDOR_INFO="Github Workflow" \
-DTEST_SHARED=FALSE \ -DTEST_SHARED=FALSE \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose

30
.github/workflows/main.yml vendored
View file

@ -88,14 +88,14 @@ jobs:
ctest -VV --test-dir build/ ctest -VV --test-dir build/
if test "${{ runner.os }}" = "Linux"; then if test "${{ runner.os }}" = "Linux"; then
# This should show us the SDL_REVISION # This should show us the SDL_REVISION
strings build/libSDL2-2.0.so.0 | grep SDL- strings build/libSDL3-3.0.so.0 | grep SDL-
fi fi
- name: Install (CMake) - name: Install (CMake)
if: "! matrix.platform.autotools" if: "! matrix.platform.autotools"
run: | run: |
set -eu set -eu
cmake --install build/ --config Release cmake --install build/ --config Release
echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
( cd cmake_prefix; find ) | LC_ALL=C sort -u ( cd cmake_prefix; find ) | LC_ALL=C sort -u
- name: Configure (Autotools) - name: Configure (Autotools)
if: matrix.platform.autotools if: matrix.platform.autotools
@ -123,8 +123,8 @@ jobs:
--x-libraries="/usr/lib/${multiarch}" \ --x-libraries="/usr/lib/${multiarch}" \
--prefix=${{ github.workspace }}/autotools_prefix \ --prefix=${{ github.workspace }}/autotools_prefix \
SDL_CFLAGS="-I${curdir}/include" \ SDL_CFLAGS="-I${curdir}/include" \
SDL_LIBS="-L${curdir}/build-autotools/build/.libs -lSDL2" \ SDL_LIBS="-L${curdir}/build-autotools/build/.libs -lSDL3" \
ac_cv_lib_SDL2_ttf_TTF_Init=no \ ac_cv_lib_SDL3_ttf_TTF_Init=no \
${NULL+} ${NULL+}
) )
fi fi
@ -147,7 +147,7 @@ jobs:
make -j"${parallel}" -C build-autotools/test check LD_LIBRARY_PATH="${curdir}/build-autotools/build/.libs" make -j"${parallel}" -C build-autotools/test check LD_LIBRARY_PATH="${curdir}/build-autotools/build/.libs"
if test "${{ runner.os }}" = "Linux"; then if test "${{ runner.os }}" = "Linux"; then
# This should show us the SDL_REVISION # This should show us the SDL_REVISION
strings "${curdir}/build-autotools/build/.libs/libSDL2-2.0.so.0" | grep SDL- strings "${curdir}/build-autotools/build/.libs/libSDL3-3.0.so.0" | grep SDL-
fi fi
- name: Install (Autotools) - name: Install (Autotools)
if: matrix.platform.autotools if: matrix.platform.autotools
@ -160,20 +160,20 @@ jobs:
make -j"${parallel}" -C build-autotools/test install V=1 make -j"${parallel}" -C build-autotools/test install V=1
fi fi
( cd autotools_prefix; find . ) | LC_ALL=C sort -u ( cd autotools_prefix; find . ) | LC_ALL=C sort -u
echo "SDL2_DIR=$(pwd)/autotools_prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/autotools_prefix" >> $GITHUB_ENV
- name: Verify CMake configuration files - name: Verify CMake configuration files
run: | run: |
cmake -S cmake/test -B cmake_config_build -G Ninja \ cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
- name: Verify sdl2-config - name: Verify sdl3-config
run: | run: |
export PATH=${{ env.SDL2_DIR }}/bin:$PATH export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh cmake/test/test_sdlconfig.sh
- name: Verify sdl2.pc - name: Verify sdl3.pc
run: | run: |
export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh cmake/test/test_pkgconfig.sh
- name: Distcheck (Autotools) - name: Distcheck (Autotools)
if: matrix.platform.autotools if: matrix.platform.autotools
@ -184,9 +184,9 @@ jobs:
# Similar to Automake `make distcheck`: check that the tarball # Similar to Automake `make distcheck`: check that the tarball
# release is sufficient to do a new build # release is sufficient to do a new build
mkdir distcheck mkdir distcheck
tar -C distcheck -zxf build-autotools/SDL2-*.tar.gz tar -C distcheck -zxf build-autotools/SDL3-*.tar.gz
( cd distcheck/SDL2-* && ./configure ) ( cd distcheck/SDL3-* && ./configure )
make -j"${parallel}" -C distcheck/SDL2-* make -j"${parallel}" -C distcheck/SDL3-*
- name: Run installed-tests (Autotools) - name: Run installed-tests (Autotools)
if: "runner.os == 'Linux' && matrix.platform.autotools" if: "runner.os == 'Linux' && matrix.platform.autotools"
run: | run: |
@ -203,4 +203,4 @@ jobs:
LD_LIBRARY_PATH=/usr/local/lib \ LD_LIBRARY_PATH=/usr/local/lib \
SDL_AUDIODRIVER=dummy \ SDL_AUDIODRIVER=dummy \
SDL_VIDEODRIVER=dummy \ SDL_VIDEODRIVER=dummy \
ginsttest-runner --tap SDL2 ginsttest-runner --tap SDL3

6
.github/workflows/msvc.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
-DSDL_TESTS=ON ` -DSDL_TESTS=ON `
-DSDL_INSTALL_TESTS=ON ` -DSDL_INSTALL_TESTS=ON `
-DSDL_VENDOR_INFO="Github Workflow" ` -DSDL_VENDOR_INFO="Github Workflow" `
-DSDL2_DISABLE_INSTALL=OFF ` -DSDL3_DISABLE_INSTALL=OFF `
${{ matrix.platform.flags }} ` ${{ matrix.platform.flags }} `
-DCMAKE_INSTALL_PREFIX=prefix -DCMAKE_INSTALL_PREFIX=prefix
- name: Build (CMake) - name: Build (CMake)
@ -56,13 +56,13 @@ jobs:
ctest -VV --test-dir build/ -C Release ctest -VV --test-dir build/ -C Release
- name: Install (CMake) - name: Install (CMake)
run: | run: |
echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/prefix" >> $Env:GITHUB_ENV echo "SDL3_DIR=$Env:GITHUB_WORKSPACE/prefix" >> $Env:GITHUB_ENV
cmake --install build/ cmake --install build/
- name: Verify CMake configuration files - name: Verify CMake configuration files
if: ${{ !contains(matrix.platform.name, 'UWP') }} # FIXME: cmake/test/CMakeLists.txt should support UWP if: ${{ !contains(matrix.platform.name, 'UWP') }} # FIXME: cmake/test/CMakeLists.txt should support UWP
run: | run: |
cmake -S cmake/test -B cmake_config_build ` cmake -S cmake/test -B cmake_config_build `
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} ` -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} `
${{ matrix.platform.flags }} ${{ matrix.platform.flags }}
cmake --build cmake_config_build --config Release cmake --build cmake_config_build --config Release

4
.github/workflows/n3ds.yml vendored
View file

@ -27,7 +27,7 @@ jobs:
run: cmake --build build --verbose run: cmake --build build --verbose
- name: Install CMake - name: Install CMake
run: | run: |
echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/ cmake --install build/
( cd prefix; find ) | LC_ALL=C sort -u ( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
@ -35,7 +35,7 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \ cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake \ -DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake \
-DTEST_SHARED=FALSE \ -DTEST_SHARED=FALSE \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
# Not running test_pkgconfig.sh and test_sdlconfig.sh # Not running test_pkgconfig.sh and test_sdlconfig.sh

12
.github/workflows/ps2.yaml vendored
View file

@ -36,7 +36,7 @@ jobs:
run: | run: |
set -eu set -eu
cmake --install build/ --config Release cmake --install build/ --config Release
echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
( cd cmake_prefix; find ) | LC_ALL=C sort -u ( cd cmake_prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
@ -44,20 +44,20 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \ cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=$PS2DEV/ps2sdk/ps2dev.cmake \ -DCMAKE_TOOLCHAIN_FILE=$PS2DEV/ps2sdk/ps2dev.cmake \
-DTEST_SHARED=FALSE \ -DTEST_SHARED=FALSE \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
- name: Verify sdl2-config - name: Verify sdl3-config
run: | run: |
export CC=mips64r5900el-ps2-elf-gcc export CC=mips64r5900el-ps2-elf-gcc
export PATH=${{ env.SDL2_DIR }}/bin:$PATH export PATH=${{ env.SDL3_DIR }}/bin:$PATH
export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib" export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib"
cmake/test/test_sdlconfig.sh cmake/test/test_sdlconfig.sh
- name: Verify sdl2.pc - name: Verify sdl3.pc
run: | run: |
export CC=mips64r5900el-ps2-elf-gcc export CC=mips64r5900el-ps2-elf-gcc
export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib" export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib"
export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh cmake/test/test_pkgconfig.sh
- name: Get short SHA - name: Get short SHA

12
.github/workflows/psp.yaml vendored
View file

@ -25,26 +25,26 @@ jobs:
run: cmake --build build --config Release run: cmake --build build --config Release
- name: Install - name: Install
run: | run: |
echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build --config Release cmake --install build --config Release
( cd prefix; find ) | LC_ALL=C sort -u ( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
run: | run: |
cmake -S cmake/test -B cmake_config_build \ cmake -S cmake/test -B cmake_config_build \
-DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake \ -DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DTEST_SHARED=FALSE \ -DTEST_SHARED=FALSE \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
- name: Verify sdl2-config - name: Verify sdl3-config
run: | run: |
export CC=psp-gcc export CC=psp-gcc
export PATH=${{ env.SDL2_DIR }}/bin:$PATH export PATH=${{ env.SDL3_DIR }}/bin:$PATH
export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib" export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib"
cmake/test/test_sdlconfig.sh cmake/test/test_sdlconfig.sh
- name: Verify sdl2.pc - name: Verify sdl3.pc
run: | run: |
export CC=psp-gcc export CC=psp-gcc
export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib" export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib"
cmake/test/test_pkgconfig.sh cmake/test/test_pkgconfig.sh

6
.github/workflows/riscos.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
- name: Install (autotools) - name: Install (autotools)
if: ${{ contains(matrix.platform.name, 'autotools') }} if: ${{ contains(matrix.platform.name, 'autotools') }}
run: | run: |
echo "SDL2_DIR=${{ github.workspace }}/prefix_autotools" >> $GITHUB_ENV echo "SDL3_DIR=${{ github.workspace }}/prefix_autotools" >> $GITHUB_ENV
make -C build_autotools install make -C build_autotools install
( cd ${{ github.workspace }}/prefix_autotools; find ) | LC_ALL=C sort -u ( cd ${{ github.workspace }}/prefix_autotools; find ) | LC_ALL=C sort -u
- name: Configure (CMake) - name: Configure (CMake)
@ -55,14 +55,14 @@ jobs:
- name: Install (CMake) - name: Install (CMake)
if: ${{ contains(matrix.platform.name, 'CMake') }} if: ${{ contains(matrix.platform.name, 'CMake') }}
run: | run: |
echo "SDL2_DIR=${{ github.workspace }}/prefix_cmake" >> $GITHUB_ENV echo "SDL3_DIR=${{ github.workspace }}/prefix_cmake" >> $GITHUB_ENV
cmake --install build/ cmake --install build/
( cd ${{ github.workspace }}/prefix_cmake; find ) | LC_ALL=C sort -u ( cd ${{ github.workspace }}/prefix_cmake; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
run: | run: |
cmake -S cmake/test -B cmake_config_build -G Ninja \ cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake \ -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
${{ matrix.platform.test_args }} ${{ matrix.platform.test_args }}
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose

12
.github/workflows/vita.yaml vendored
View file

@ -30,7 +30,7 @@ jobs:
run: cmake --build build --verbose run: cmake --build build --verbose
- name: Install CMake - name: Install CMake
run: | run: |
echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/ cmake --install build/
( cd prefix; find ) | LC_ALL=C sort -u ( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files - name: Verify CMake configuration files
@ -38,16 +38,16 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \ cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \
-DTEST_SHARED=FALSE \ -DTEST_SHARED=FALSE \
-DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose cmake --build cmake_config_build --verbose
- name: Verify sdl2-config - name: Verify sdl3-config
run: | run: |
export CC=arm-vita-eabi-gcc export CC=arm-vita-eabi-gcc
export PATH=${{ env.SDL2_DIR }}/bin:$PATH export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh cmake/test/test_sdlconfig.sh
- name: Verify sdl2.pc - name: Verify sdl3.pc
run: | run: |
export CC=arm-vita-eabi-gcc export CC=arm-vita-eabi-gcc
export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh cmake/test/test_pkgconfig.sh

2
.github/workflows/watcom.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: open-watcom/setup-watcom@v0 - uses: open-watcom/setup-watcom@v0
- name: Build SDL2 - name: Build
run: | run: |
wmake -f ${{ matrix.platform.makefile }} ENABLE_WERROR=1 wmake -f ${{ matrix.platform.makefile }} ENABLE_WERROR=1
- name: Build tests - name: Build tests