Browse Source

Working on iOS build

Josh Engebretson 11 years ago
parent
commit
2a711e2653

BIN
AtomicResources.pak


+ 17 - 0
CMake/Modules/AtomicIOS.cmake

@@ -0,0 +1,17 @@
+include (BundleUtilities)
+
+add_definitions (-DIOS -DATOMIC_PLATFORM_IOS -DATOMIC_OPENGL -DKNET_UNIX)
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
+
+set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_INCLUDING_64_BIT))
+set (CMAKE_XCODE_EFFECTIVE_PLATFORMS -iphoneos -iphonesimulator)
+
+# Set Base SDK to "Latest iOS"
+set (CMAKE_OSX_SYSROOT iphoneos)    
+
+# Obtain iOS sysroot path
+execute_process (COMMAND xcodebuild -version -sdk ${CMAKE_OSX_SYSROOT} Path OUTPUT_VARIABLE IOS_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)   
+
+set (CMAKE_FIND_ROOT_PATH ${IOS_SYSROOT})
+
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AudioToolbox -framework CoreAudio -framework CoreGraphics -framework Foundation -framework OpenGLES -framework QuartzCore -framework UIKit")

+ 0 - 0
CMake/Modules/AtomicApple.cmake → CMake/Modules/AtomicMac.cmake


+ 5 - 1
CMakeLists.txt

@@ -18,9 +18,13 @@ if (MSVC)
 
     include(AtomicWindows)
 
+elseif (IOS)
+
+	include(AtomicIOS)
+
 elseif(APPLE)
 
-    include(AtomicApple)
+    include(AtomicMac)
 
 elseif(ANDROID)
 

BIN
Resources/AtomicResources.pak


+ 1 - 1
Source/Atomic/CMakeLists.txt

@@ -34,7 +34,7 @@ else()
 
 endif()
 
-if (APPLE)
+if (APPLE AND NOT IOS)
     set (PLATFORM_SOURCE IO/MacFileWatcher.mm)
 endif()
 

+ 1 - 1
Source/CMakeLists.txt

@@ -3,7 +3,7 @@ add_subdirectory(ThirdParty)
 add_subdirectory(Atomic)
 add_subdirectory(AtomicPlayer)
 
-if (NOT ANDROID AND NOT EMSCRIPTEN)
+if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
 add_subdirectory(Tools)
 add_subdirectory(AtomicEditor)
 endif()

+ 2 - 2
Source/ThirdParty/CMakeLists.txt

@@ -17,13 +17,13 @@ if (NOT EMSCRIPTEN)
 	add_subdirectory(kNet)
 endif()
 
-if (NOT ANDROID AND NOT EMSCRIPTEN)
+if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
     add_subdirectory(LibCpuId)
     add_subdirectory(SQLite)
     add_subdirectory(TurboBadger)    
 endif ()
 
-if (APPLE)
+if (APPLE AND NOT IOS)
     add_subdirectory(GLEW)
 endif()