replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / security / provisioning / SConscript

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 5956bb0..0e810fb 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -48,7 +48,7 @@ provisioning_env.AppendUnique(CPPPATH = [
                'include/oxm',
                '../../resource/csdk/security/include',
                '../../../../extlibs/cjson/',
-               '../../../../extlibs/tinydtls/',
+               '../../../../extlibs/mbedtls/mbedtls/include',
                '../../connectivity/inc',
                '../../connectivity/inc/pkix',
                '../../connectivity/external/inc',
@@ -56,8 +56,6 @@ provisioning_env.AppendUnique(CPPPATH = [
                '../../connectivity/api',
                '../include',
                '../include/internal',
-               '../../../../extlibs/tinydtls/ecc',
-               '../../../../extlibs/tinydtls/sha2',
                '../../../../extlibs/asn1cert',
                'ck_manager/include'
                ])
@@ -73,7 +71,7 @@ provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_a
 provisioning_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
 
 
-if target_os not in ['msys_nt', 'windows', 'android']:
+if target_os not in ['msys_nt', 'windows', 'android', 'ios']:
        provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
 
 if target_os in ['windows', 'msys_nt']:
@@ -82,6 +80,7 @@ if target_os in ['windows', 'msys_nt']:
 if target_os in ['android']:
        provisioning_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
        provisioning_env.AppendUnique(LIBS = ['gnustl_static'])
+       provisioning_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libocpmapi.so'])
 
 if target_os in ['darwin', 'ios']:
        provisioning_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
@@ -90,7 +89,7 @@ if provisioning_env.get('LOGGING'):
     provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 if provisioning_env.get('MULTIPLE_OWNER') == '1':
-       provisioning_env.AppendUnique(CPPDEFINES=['_ENABLE_MULTIPLE_OWNER_'])
+       provisioning_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
 
 ######################################################################
 # Source files and Targets
@@ -128,7 +127,7 @@ else:
        provisioning_env.AppendUnique(CPPPATH = ['../../../../extlibs/sqlite3'])
        provisioning_src = provisioning_src + [root_dir+'/extlibs/sqlite3/sqlite3.c' ]
 
-if target_os in ['windows', 'msys_nt']:
+if target_os in ['windows', 'msys_nt', 'ios']:
        # octbstack.dll is exporting ocpmapi APIs on Windows - there is no ocpmapi.dll.
        provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src)
 else: