Commit e4aaadab authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI

Small fixes for iOS builder (not yet OK)

parent 2bef0f87
......@@ -57,12 +57,12 @@ if("${PLATFORM}" MATCHES "Simulator")
else("${PLATFORM}" MATCHES "Simulator")
set(CLANG_TARGET_SPECIFIER "iphoneos-version-min")
endif("${PLATFORM}" MATCHES "Simulator")
list(get CMAKE_FIND_ROOT_PATH 0 SYSROOT_PATH)
list(GET CMAKE_FIND_ROOT_PATH 0 SYSROOT_PATH)
set(COMMON_FLAGS "-arch ${CMAKE_SYSTEM_PROCESSOR} -isysroot ${SYSROOT_PATH} -m${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions")
set(LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS "${COMMON_FLAGS} -Dasm=__asm")
set(LINPHONE_BUILDER_TOOLCHAIN_CFLAGS "-std=c99")
set(LINPHONE_BUILDER_TOOLCHAIN_OBJCFLAGS "-std=c99 ${COMMON_FLAGS} -x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch")
set(LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS "${COMMON_FLAGS}")
set(LINPHONE_BUILDER_CPPFLAGS "${COMMON_FLAGS} -Dasm=__asm")
set(LINPHONE_BUILDER_CFLAGS "-std=c99")
#set(LINPHONE_BUILDER_OBJCFLAGS "-std=c99 ${COMMON_FLAGS} -x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch")
set(LINPHONE_BUILDER_LDFLAGS "${COMMON_FLAGS}")
set(LINPHONE_BUILDER_PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) # Restrict pkg-config to search in the install directory
unset(COMMON_FLAGS)
unset(CLANG_TARGET_SPECIFIER)
......
......@@ -146,9 +146,9 @@ class IOSarmv7Target(IOSTarget):
def __init__(self):
IOSTarget.__init__(self, 'armv7')
class IOSarmv7sTarget(IOSTarget):
class IOSarm64Target(IOSTarget):
def __init__(self):
IOSTarget.__init__(self, 'armv7s')
IOSTarget.__init__(self, 'arm64')
class PythonTarget(Target):
def __init__(self):
......@@ -170,7 +170,7 @@ targets['bb10-i486'] = BB10i486Target()
targets['desktop'] = DesktopTarget()
targets['ios-i386'] = IOSi386Target()
targets['ios-armv7'] = IOSarmv7Target()
targets['ios-armv7s'] = IOSarmv7sTarget()
targets['ios-arm64'] = IOSarm64Target()
targets['python'] = PythonTarget()
targets['python-raspberry'] = PythonRaspberryTarget()
target_names = sorted(targets.keys())
......
......@@ -46,7 +46,7 @@ message(STATUS "Using sysroot path: ${SYSROOT_PATH}")
set(IOS_TOOLCHAIN_HOST ${COMPILER_PREFIX})
foreach(TOOLNAME clang clang++ ld ar ranlib strip nm)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolchains/ios/tool_wrapper.cmake ${CMAKE_CURRENT_BINARY_DIR}/${IOS_TOOLCHAIN_HOST}-${TOOLNAME})
configure_file(${CMAKE_CURRENT_LIST_DIR}/tool_wrapper.cmake ${CMAKE_CURRENT_BINARY_DIR}/${IOS_TOOLCHAIN_HOST}-${TOOLNAME})
endforeach(TOOLNAME)
set(IOS_TOOLCHAIN_CC "${CMAKE_CURRENT_BINARY_DIR}/${IOS_TOOLCHAIN_HOST}-clang")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment