replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / stack / samples / linux / SimpleClientServer / SConscript

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index bfa9bda..6f4dd48 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -26,13 +26,21 @@ with_ra = samples_env.get ('WITH_RA')
 ######################################################################
 # Build flags
 ######################################################################
+with_upstream_libcoap = samples_env.get('WITH_UPSTREAM_LIBCOAP')
+if with_upstream_libcoap == '1':
+       # For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded.
+       samples_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+       # For bring up purposes only, the forked version will live here.
+       samples_env.AppendUnique(CPPPATH = ['../../../../../connectivity/lib/libcoap-4.1.1/include'])
+
 samples_env.PrependUnique(CPPPATH = [
                '../../../../logger/include',
                '../../../../stack/include',
+               '../../../../security/include',
                '../../../../../../extlibs/cjson',
                '../../../../../../extlibs/boost/boost',
                '../../../../../oc_logger/include',
-               '../../../../../connectivity/lib/libcoap-4.1.1'
                ])
 
 compiler = samples_env.get('CXX')
@@ -50,9 +58,6 @@ if target_os not in ['arduino', 'windows', 'darwin', 'ios', 'msys_nt']:
 if target_os not in ['windows']:
        samples_env.PrependUnique(LIBS = ['m'])
 
-if samples_env.get('SECURED') == '1':
-    samples_env.AppendUnique(LIBS = ['tinydtls'])
-
 samples_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 ######################################################################