Imported Upstream version 0.9.2

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

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 63e6462..cee8dc9 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -29,6 +29,7 @@ SConscript(env.get('SRC_DIR') + '/resource/third_party_libs.scons', 'lib_env')
 liboctbstack_env = lib_env.Clone()
 
 target_os = env.get('TARGET_OS')
+with_ra = env.get('WITH_RA')
 # As in the source code, it includes arduino Time library (C++)
 # It requires compile the .c with g++
 if target_os == 'arduino':
@@ -43,17 +44,19 @@ liboctbstack_env.PrependUnique(CPPPATH = [
                '../../extlibs/timer/',
                'logger/include',
                'ocrandom/include',
-               'ocmalloc/include',
                'stack/include',
                'stack/include/internal',
                '../oc_logger/include',
                'connectivity/lib/libcoap-4.1.1',
                'connectivity/inc',
                'connectivity/api',
+               'connectivity/external/inc',
                'security/include',
                'security/include/internal',
                ])
 
+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'])
@@ -63,8 +66,10 @@ if target_os not in ['windows', 'winrt']:
 
 liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 
-if target_os in ['android', 'linux', 'tizen']:
+if target_os in ['android', 'linux','tizen']:
        liboctbstack_env.AppendUnique(LIBS = ['connectivity_abstraction'])
+       if with_ra:
+               liboctbstack_env.AppendUnique(LIBS = ['ra_xmpp'])
 liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
 
 if target_os == 'tizen':
@@ -90,6 +95,8 @@ if env.get('SECURED') == '1':
 if env.get('LOGGING'):
        liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
+liboctbstack_env.Append(LIBS = ['c_common'])
+
 ######################################################################
 # Source files and Targets
 ######################################################################
@@ -98,22 +105,28 @@ liboctbstack_src = [
        '../../extlibs/cjson/cJSON.c',
        '../../extlibs/timer/timer.c',
        OCTBSTACK_SRC + 'ocstack.c',
+       OCTBSTACK_SRC + 'ocpayload.c',
+       OCTBSTACK_SRC + 'ocpayloadparse.c',
+       OCTBSTACK_SRC + 'ocpayloadconvert.c',
        OCTBSTACK_SRC + 'occlientcb.c',
        OCTBSTACK_SRC + 'ocresource.c',
        OCTBSTACK_SRC + 'ocobserve.c',
        OCTBSTACK_SRC + 'ocserverrequest.c',
        OCTBSTACK_SRC + 'occollection.c',
        OCTBSTACK_SRC + 'oicgroup.c',
-       'security/src/ocsecurity.c',
        'logger/src/logger.c',
-       'ocrandom/src/ocrandom.c',
-       'ocmalloc/src/ocmalloc.c'
+       'ocrandom/src/ocrandom.c'
        ]
+
+liboctbstack_src.extend(env['cbor_files'])
+
 if target_os in ['arduino','darwin','ios'] :
        static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src)
        liboctbstack_env.InstallTarget(static_liboctbstack, 'liboctbstack')
+       liboctbstack_env.UserInstallTargetLib(static_liboctbstack, 'liboctbstack')
 else:
        static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src)
        shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src)
        liboctbstack_env.InstallTarget([static_liboctbstack, shared_liboctbstack], 'liboctbstack')
+       liboctbstack_env.UserInstallTargetLib([static_liboctbstack, shared_liboctbstack], 'liboctbstack')