Common adapter for DTLS/TLS

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

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index c493183..5897a39 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -95,12 +95,11 @@ liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 liboctbstack_env.PrependUnique(LIBS = ['ocsrm', 'coap'])
 
 if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False):
-    liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN'))
+       liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN'))
 
 if env.get('SECURED') == '1':
        liboctbstack_env.AppendUnique(LIBS = ['tinydtls'])
-       if env.get('WITH_TCP') == True:
-               liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
+       liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 
 if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']:
        liboctbstack_env.PrependUnique(LIBS = ['connectivity_abstraction'])
@@ -146,14 +145,11 @@ if target_os in ['darwin', 'ios']:
 if target_os not in ['arduino', 'windows']:
        liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
 if target_os == 'android':
-    liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so'])
+       liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboctbstack.so'])
 
 if env.get('LOGGING'):
        liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if env.get('DTLS_WITH_X509') == '1':
-       liboctbstack_env.AppendUnique(CPPDEFINES = ['__WITH_X509__'])
-
 liboctbstack_env.Append(LIBS = ['c_common'])
 
 if liboctbstack_env.get('ROUTING') in ['GW', 'EP']:
@@ -179,12 +175,14 @@ liboctbstack_src = [
        ]
 
 if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       liboctbstack_src.append(OCTBSTACK_SRC + 'rdpayload.c')
-       liboctbstack_src.append(OCTBSTACK_SRC + 'oicresourcedirectory.c')
        if 'CLIENT' in rd_mode:
                liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
        if 'SERVER' in rd_mode:
                liboctbstack_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
+       if target_os in ['linux', 'android']:
+               liboctbstack_env.Prepend(LIBS = ['resource_directory'])
+               liboctbstack_env.PrependUnique(CPPPATH = [env.get('BUILD_DIR') + 'resource/csdk/resource-directory/include'])
+               liboctbstack_env.PrependUnique(LIBPATH = [env.get('BUILD_DIR') + 'resource/csdk/resource-directory/include'])
 
 if with_tcp == True:
        liboctbstack_src.append(OCTBSTACK_SRC + 'oickeepalive.c')