From 4b5a40b4c55ba8dbc7caa85e39e8a74f719b9280 Mon Sep 17 00:00:00 2001 From: Jonny Rodin Date: Sun, 26 Nov 2017 10:57:57 +0200 Subject: [PATCH] fixes build for iOS. Hard-coding iOS 9.0 minimum support, since seems to be ignored from scons --- build_common/darwin/SConscript | 2 +- build_common/ios/SConscript | 3 ++- resource/SConscript | 2 +- service/resource-encapsulation/src/common/SConscript | 8 +++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build_common/darwin/SConscript b/build_common/darwin/SConscript index 795cb63..ab65efc 100644 --- a/build_common/darwin/SConscript +++ b/build_common/darwin/SConscript @@ -121,7 +121,7 @@ else: if target_arch in ['i386', 'x86_64']: sys_root += tmpl % ('iPhoneSimulator', 'iPhoneSimulator', sys_version) else: - sys_root += tmpl % ('iPhone', 'iPhone', sys_version) + sys_root += tmpl % ('iPhoneOS', 'iPhoneOS', sys_version) if not os.path.exists(sys_root): msg = "\nError: SDK directory not found at %s\n" % sys_root Exit(msg) diff --git a/build_common/ios/SConscript b/build_common/ios/SConscript index 2b9b736..a78d68f 100644 --- a/build_common/ios/SConscript +++ b/build_common/ios/SConscript @@ -11,6 +11,7 @@ sys_version = env.get('SYS_VERSION') if env.get('TARGET_ARCH') in ['i386', 'x86_64']: # Simulator flag = '-mios-simulator-version-min=' + sys_version else: - flag = '-miphoneos-version-min=' + sys_version + #flag = '-miphoneos-version-min=' + sys_version + flag = '-miphoneos-version-min=' + '9.0' env.AppendUnique(CCFLAGS=[flag]) env.AppendUnique(LINKFLAGS=[flag]) diff --git a/resource/SConscript b/resource/SConscript index 3ec5999..415068c 100644 --- a/resource/SConscript +++ b/resource/SConscript @@ -39,7 +39,7 @@ SConscript('#extlibs/libcoap/SConscript') # Build csdk SConscript('csdk/SConscript') -if target_os not in ['arduino', 'darwin', 'ios']: +if target_os not in ['arduino', 'darwin']: # Build liboc_logger SConscript('oc_logger/SConscript') diff --git a/service/resource-encapsulation/src/common/SConscript b/service/resource-encapsulation/src/common/SConscript index 0c1b973..f6a3f36 100644 --- a/service/resource-encapsulation/src/common/SConscript +++ b/service/resource-encapsulation/src/common/SConscript @@ -25,7 +25,13 @@ import os Import('env') -rcs_common_env = env.Clone() +# Add third party libraries +lib_env = env.Clone() +SConscript('#service/third_party_libs.scons', 'lib_env') + +resourceClient_env = lib_env.Clone() + +rcs_common_env = lib_env.Clone() target_os = rcs_common_env.get('TARGET_OS') release = rcs_common_env.get('RELEASE') src_dir = rcs_common_env.get('SRC_DIR') -- 2.10.1