From 8cd21590ecf028de6f162aa15a57d744fc3aa18e Mon Sep 17 00:00:00 2001 From: SFENCE Date: Sat, 30 Aug 2025 21:04:37 +0200 Subject: [PATCH] Try to fix iOS build. --- irr/src/CMakeLists.txt | 8 ++------ util/ci/build_ios.sh | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt index a2e8ed94e9..178ebc4333 100644 --- a/irr/src/CMakeLists.txt +++ b/irr/src/CMakeLists.txt @@ -249,7 +249,7 @@ if(USE_SDL2) if(NOT USE_SDL2_STATIC) set(USE_SDL2_SHARED TRUE) endif() - if(NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") + if(NOT ANDROID) find_package(SDL2 REQUIRED) else() # provided by AndroidLibs.cmake or from cmake call @@ -630,11 +630,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS") "-framework CoreMotion" "-framework IOSurface" ${OPENGLES2_LIBRARY} - ${SDL2_LIBRARIES} - ) -else() - target_link_libraries(IrrlichtMt PRIVATE - "$<$:SDL2::SDL2>" + SDL2::SDL2main ) endif() diff --git a/util/ci/build_ios.sh b/util/ci/build_ios.sh index 8b661f0921..789854acc8 100755 --- a/util/ci/build_ios.sh +++ b/util/ci/build_ios.sh @@ -12,8 +12,8 @@ cmake .. -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=$osver -DCMAKE_FI -DENABLE_OPENGL3=OFF \ -DENABLE_GLES2=ON \ -DUSE_SDL2=ON \ - -DSDL2_LIBRARIES="${DEPS_DIR}/lib/libSDL2.a;${DEPS_DIR}/lib/libSDL2main.a" \ - -DSDL2_INCLUDE_DIRS=${DEPS_DIR}/include/SDL2 \ + -DUSE_SDL2_STATIC=ON \ + -DSDL2_DIR=${DEPS_DIR}/lib/cmake/SDL2 \ -DOPENGLES2_LIBRARY=${DEPS_DIR}/lib/libGLESv2_static.a \ -DOPENGLES2_INCLUDE_DIR=${DEPS_DIR}/include/ANGLE \ -DCURL_LIBRARY=${DEPS_DIR}/lib/libcurl.a \