From 4d8a50912becbe8296ad7faa4dfc39f7ce05f51b Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 16 Feb 2023 20:29:36 +0100 Subject: [PATCH] cmake: no shared SDL libraries for riscos --- .github/workflows/riscos.yml | 1 + CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml index 9d7b08af8..02c046d90 100644 --- a/.github/workflows/riscos.yml +++ b/.github/workflows/riscos.yml @@ -50,6 +50,7 @@ jobs: - name: Verify CMake configuration files run: | cmake -S cmake/test -B cmake_config_build -G Ninja \ + -DTEST_SHARED=OFF \ -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake \ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a410de31..1f688ff29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,7 +323,7 @@ if(EMSCRIPTEN) set(SDL_CPUINFO_ENABLED_BY_DEFAULT OFF) endif() -if(VITA OR PSP OR PS2 OR N3DS) +if(VITA OR PSP OR PS2 OR N3DS OR RISCOS) set(SDL_SHARED_ENABLED_BY_DEFAULT OFF) set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF) endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index df39b1a10..0aecc33aa 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,7 @@ include(CMakePushCheckState) include(GNUInstallDirs) set(SDL_TESTS_LINK_SHARED_DEFAULT ON) -if(EMSCRIPTEN OR N3DS OR PS2 OR PSP OR VITA) +if(EMSCRIPTEN OR N3DS OR PS2 OR PSP OR RISCOS OR VITA) set(SDL_TESTS_LINK_SHARED_DEFAULT OFF) endif()