Explorar o código

Added Urho3D library build option for IOS.

Wei Tjong Yao %!s(int64=12) %!d(string=hai) anos
pai
achega
ccd6a926ae

+ 1 - 1
Source/CMake/Modules/Urho3D-CMake-magic.cmake

@@ -296,7 +296,7 @@ macro (setup_library)
     add_library (${TARGET_NAME} ${LIB_TYPE} ${SOURCE_FILES})
     add_library (${TARGET_NAME} ${LIB_TYPE} ${SOURCE_FILES})
     setup_target ()
     setup_target ()
     
     
-    if (CMAKE_PROJECT_NAME STREQUAL Urho3D AND NOT LIB_TYPE STREQUAL SHARED AND URHO3D_BUILD_TYPE MATCHES "STATIC|SHARED" AND NOT IOS AND NOT ANDROID)
+    if (CMAKE_PROJECT_NAME STREQUAL Urho3D AND NOT LIB_TYPE STREQUAL SHARED AND URHO3D_BUILD_TYPE MATCHES "STATIC|SHARED" AND NOT ANDROID)
         set (STATIC_LIBRARY_TARGETS ${STATIC_LIBRARY_TARGETS} ${TARGET_NAME} PARENT_SCOPE)
         set (STATIC_LIBRARY_TARGETS ${STATIC_LIBRARY_TARGETS} ${TARGET_NAME} PARENT_SCOPE)
         if (URHO3D_BUILD_TYPE STREQUAL SHARED)
         if (URHO3D_BUILD_TYPE STREQUAL SHARED)
             set_target_properties (${TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS URHO3D_EXPORTS)
             set_target_properties (${TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS URHO3D_EXPORTS)

+ 1 - 1
Source/CMakeLists.txt

@@ -109,7 +109,7 @@ if (NOT IOS AND NOT ANDROID)
 endif ()    
 endif ()    
 
 
 # Urho3D build type is mutually exclusive due to potential different visibility (export) attribute
 # Urho3D build type is mutually exclusive due to potential different visibility (export) attribute
-if (URHO3D_BUILD_TYPE MATCHES "STATIC|SHARED" AND NOT IOS AND NOT ANDROID)
+if (URHO3D_BUILD_TYPE MATCHES "STATIC|SHARED" AND NOT ANDROID)
     # Urho3D library
     # Urho3D library
     add_subdirectory (Engine)
     add_subdirectory (Engine)
 else ()
 else ()

+ 1 - 1
Source/ThirdParty/SDL/CMakeLists.txt

@@ -28,7 +28,7 @@ if (WIN32)
 elseif (IOS)
 elseif (IOS)
     file (GLOB SYS_C_FILES
     file (GLOB SYS_C_FILES
         src/audio/coreaudio/*.c src/file/cocoa/*.m src/joystick/iphoneos/*.m src/loadso/dlopen/*.c src/power/uikit/*.m
         src/audio/coreaudio/*.c src/file/cocoa/*.m src/joystick/iphoneos/*.m src/loadso/dlopen/*.c src/power/uikit/*.m
-        src/thread/pthread/*.c src/timer/unix/*.c src/video/uikit/*.m src/video/uikit/*.c src/haptic/dummy/*.c src/joystick/dummy/*.c
+        src/thread/pthread/*.c src/timer/unix/*.c src/video/uikit/*.m src/video/uikit/*.c src/haptic/dummy/*.c
     )
     )
 elseif (APPLE)
 elseif (APPLE)
     file (GLOB SYS_C_FILES
     file (GLOB SYS_C_FILES