oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Try to fix iOS build.

Browse source
This commit is contained in:
SFENCE 2025-08-30 21:04:37 +02:00
parent 803870e0d2
commit 8cd21590ec
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
irr/src/CMakeLists.txt
View file

@ -249,7 +249,7 @@ if(USE_SDL2)
if(NOT USE_SDL2_STATIC) if(NOT USE_SDL2_STATIC)
set(USE_SDL2_SHARED TRUE) set(USE_SDL2_SHARED TRUE)
endif() endif()
if(NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") if(NOT ANDROID)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
else() else()
# provided by AndroidLibs.cmake or from cmake call # provided by AndroidLibs.cmake or from cmake call
@ -630,11 +630,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
"-framework CoreMotion" "-framework CoreMotion"
"-framework IOSurface" "-framework IOSurface"
${OPENGLES2_LIBRARY} ${OPENGLES2_LIBRARY}
${SDL2_LIBRARIES} SDL2::SDL2main
)
else()
target_link_libraries(IrrlichtMt PRIVATE
"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
) )
endif() endif()

4
util/ci/build_ios.sh
View file

@ -12,8 +12,8 @@ cmake .. -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=$osver -DCMAKE_FI
-DENABLE_OPENGL3=OFF \ -DENABLE_OPENGL3=OFF \
-DENABLE_GLES2=ON \ -DENABLE_GLES2=ON \
-DUSE_SDL2=ON \ -DUSE_SDL2=ON \
-DSDL2_LIBRARIES="${DEPS_DIR}/lib/libSDL2.a;${DEPS_DIR}/lib/libSDL2main.a" \ -DUSE_SDL2_STATIC=ON \
-DSDL2_INCLUDE_DIRS=${DEPS_DIR}/include/SDL2 \ -DSDL2_DIR=${DEPS_DIR}/lib/cmake/SDL2 \
-DOPENGLES2_LIBRARY=${DEPS_DIR}/lib/libGLESv2_static.a \ -DOPENGLES2_LIBRARY=${DEPS_DIR}/lib/libGLESv2_static.a \
-DOPENGLES2_INCLUDE_DIR=${DEPS_DIR}/include/ANGLE \ -DOPENGLES2_INCLUDE_DIR=${DEPS_DIR}/include/ANGLE \
-DCURL_LIBRARY=${DEPS_DIR}/lib/libcurl.a \ -DCURL_LIBRARY=${DEPS_DIR}/lib/libcurl.a \