Skip to content

Commit c7308b8

Browse files
committed
Add iOS flags handling in cmake
1 parent b185544 commit c7308b8

File tree

6 files changed

+23
-14
lines changed

6 files changed

+23
-14
lines changed

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of t
3434
CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
3535
"NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
3636

37-
if(APPLE)
37+
if(APPLE AND NOT IOS)
3838
list(APPEND CMAKE_PREFIX_PATH /usr/local/opt)
3939
include_directories(/usr/local/opt/fribidi/include/)
4040
include_directories(/usr/local/opt/openssl@1.1/include/)
@@ -43,6 +43,12 @@ if(APPLE)
4343
include_directories(/usr/local/opt/harfbuzz/include/harfbuzz/)
4444
endif()
4545

46+
if (IOS)
47+
ADD_DEFINITIONS(-DMOBILE_STK)
48+
ADD_DEFINITIONS(-DIOS_STK)
49+
option(USE_GLES2 "Use OpenGL ES2 renderer" ON)
50+
endif()
51+
4652
if((UNIX AND NOT APPLE) AND NOT SERVER_ONLY)
4753
option(ENABLE_WAYLAND_DEVICE "Enable Wayland device for linux build" ON)
4854

@@ -166,7 +172,7 @@ else()
166172
endif()
167173

168174
# Find system GLEW library or build it if missing
169-
if (APPLE)
175+
if (APPLE AND NOT IOS)
170176
find_package(glew)
171177

172178
if(GLEW_FOUND)
@@ -264,7 +270,7 @@ endif()
264270
# Set include paths
265271
include_directories(${STK_SOURCE_DIR})
266272

267-
if(APPLE)
273+
if(APPLE AND NOT IOS)
268274
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
269275
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
270276
elseif(MSVC)
@@ -430,7 +436,7 @@ include(cmake/SourceGroupFunctions.cmake)
430436
source_group_hierarchy(STK_SOURCES STK_HEADERS)
431437

432438

433-
if(APPLE)
439+
if(APPLE AND NOT IOS)
434440
# icon files to copy in the bundle
435441
set(OSX_ICON_FILES ${PROJECT_SOURCE_DIR}/data/supertuxkart.icns)
436442
set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)

lib/angelscript/projects/cmake/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
111111
enable_language(ASM)
112112
if(CMAKE_ASM_COMPILER_WORKS)
113113
set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
114-
set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
114+
if (NOT IOS)
115+
set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
116+
endif()
115117
else()
116118
message(FATAL ERROR "ARM target requires a working assembler")
117119
endif()

lib/bullet/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
44

5-
if(APPLE)
5+
if(APPLE AND NOT IOS)
66
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
88
endif()

lib/enet/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
include_directories("include")
44

5-
if(APPLE)
5+
if(APPLE AND NOT IOS)
66
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
88
endif()

lib/irrlicht/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ if(NOT SERVER_ONLY)
3535
endif()
3636
endif()
3737

38-
if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
38+
if(NOT APPLE AND (USE_GLES2 OR ENABLE_WAYLAND_DEVICE))
3939
find_package(EGL)
4040

4141
if(EGL_FOUND)
4242
include_directories(${EGL_INCLUDE_DIR})
4343
else()
44-
if(USE_GLES2)
44+
if(USE_GLES2 AND NOT APPLE)
4545
message(FATAL_ERROR "EGL not found.")
4646
elseif(ENABLE_WAYLAND_DEVICE)
4747
message(WARNING "EGL not found. Disable wayland support.")
@@ -79,7 +79,7 @@ else()
7979
add_definitions(-DNO_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
8080
endif()
8181

82-
if(APPLE)
82+
if(APPLE AND NOT IOS)
8383
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/MacOSX" "${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht")
8484
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
8585
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -F/Library/Frameworks")
@@ -584,7 +584,7 @@ if(NOT SERVER_ONLY AND ENABLE_WAYLAND_DEVICE)
584584
endif()
585585

586586

587-
if(APPLE)
587+
if(APPLE AND NOT IOS)
588588
set(IRRLICHT_SOURCES
589589
${IRRLICHT_SOURCES}
590590
source/Irrlicht/MacOSX/AppDelegate.mm
@@ -614,7 +614,7 @@ if(NOT SERVER_ONLY)
614614
target_link_libraries(stkirrlicht ${X11_X11_LIB} ${X11_Xrandr_LIB})
615615
endif()
616616

617-
if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
617+
if(NOT APPLE AND (USE_GLES2 OR ENABLE_WAYLAND_DEVICE))
618618
target_link_libraries(stkirrlicht ${EGL_LIBRARY})
619619
endif()
620620

lib/libsquish/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
1212

1313
OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." OFF)
1414

15-
if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR
15+
if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR
16+
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") OR
1617
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR
1718
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "powerpc") OR
1819
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64") OR
@@ -39,7 +40,7 @@ IF (BUILD_SQUISH_WITH_OPENMP)
3940
ENDIF()
4041

4142
IF (CMAKE_GENERATOR STREQUAL "Xcode")
42-
SET(CMAKE_OSX_ARCHITECTURES "x86_64")
43+
SET(CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
4344
IF (BUILD_SQUISH_WITH_SSE2 AND WIN32)
4445
ADD_DEFINITIONS(-DSQUISH_USE_SSE=2)
4546
ENDIF (BUILD_SQUISH_WITH_SSE2 AND WIN32)

0 commit comments

Comments
 (0)