Imported Upstream version 1.1.0

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

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index fbbad61..37dc29b 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -30,6 +30,8 @@ liboctbstack_env = lib_env.Clone()
 
 target_os = env.get('TARGET_OS')
 with_ra = env.get('WITH_RA')
+with_ra_ibb = env.get('WITH_RA_IBB')
+with_tcp = env.get('WITH_TCP')
 # As in the source code, it includes arduino Time library (C++)
 # It requires compile the .c with g++
 if target_os == 'arduino':
@@ -47,15 +49,15 @@ liboctbstack_env.PrependUnique(CPPPATH = [
                'stack/include/internal',
                '../oc_logger/include',
                'connectivity/lib/libcoap-4.1.1',
+               'connectivity/common/inc',
                'connectivity/inc',
                'connectivity/api',
                'connectivity/external/inc',
                'security/include',
                'security/include/internal',
+               'security/provisioning/include',
                ])
 
-liboctbstack_env.AppendUnique(LIBS = ['ocsrm'])
-
 if target_os not in ['arduino', 'windows', 'winrt']:
        liboctbstack_env.AppendUnique(CPPDEFINES  = ['WITH_POSIX'])
        liboctbstack_env.AppendUnique(CFLAGS = ['-std=c99'])
@@ -73,10 +75,14 @@ liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 if target_os in ['android', 'linux', 'tizen']:
        liboctbstack_env.PrependUnique(LIBS = ['connectivity_abstraction'])
 
-       if with_ra:
-               liboctbstack_env.AppendUnique(LIBS = ['ra_xmpp'])
+       if with_ra_ibb:
+               liboctbstack_env.AppendUnique(LIBS = liboctbstack_env['RALIBS'], LIBPATH = liboctbstack_env['RALIBPATH'], RPATH = liboctbstack_env['RARPATH'])
+       else :
+               if with_ra:
+                       liboctbstack_env.AppendUnique(LIBS = ['ra_xmpp'])
 
 liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
+liboctbstack_env.PrependUnique(LIBS = ['ocsrm'])
 
 if target_os in ['tizen', 'linux']:
        liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid")
@@ -104,6 +110,11 @@ if env.get('LOGGING'):
 if env.get('DTLS_WITH_X509') == '1':
        liboctbstack_env.AppendUnique(CPPDEFINES = ['__WITH_X509__'])
 
+if env.get('WITH_RD') == '1':
+       liboctbstack_env.PrependUnique(CPPPATH = ['../../service/resource-directory/include'])
+       liboctbstack_env.AppendUnique(CPPDEFINES = ['-DWITH_RD'])
+       liboctbstack_env.AppendUnique(LIBS = ['resource_directory'])
+
 liboctbstack_env.Append(LIBS = ['c_common'])
 
 if liboctbstack_env.get('ROUTING') in ['GW', 'EP']:
@@ -126,10 +137,12 @@ liboctbstack_src = [
        OCTBSTACK_SRC + 'ocserverrequest.c',
        OCTBSTACK_SRC + 'occollection.c',
        OCTBSTACK_SRC + 'oicgroup.c',
-       'logger/src/logger.c',
        OCTBSTACK_SRC + "rdpayload.c"
        ]
 
+if with_tcp == True:
+       liboctbstack_src.append(OCTBSTACK_SRC + 'oickeepalive.c')
+
 liboctbstack_src.extend(env['cbor_files'])
 
 if target_os in ['arduino','darwin','ios'] :
@@ -146,4 +159,4 @@ else:
        liboctbstack_env.UserInstallTargetHeader('stack/include/ocstackconfig.h', 'resource', 'ocstackconfig.h')
        liboctbstack_env.UserInstallTargetHeader('stack/include/octypes.h', 'resource', 'octypes.h')
        liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h')
-
+       liboctbstack_env.UserInstallTargetHeader('stack/include/ocpresence.h', 'resource', 'ocpresence.h')