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 5a3305b..6f4dd48 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -18,28 +18,37 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-Import('env')
-target_os = env.get('TARGET_OS')
-samples_env = env.Clone()
-with_ra = env.get ('WITH_RA')
+thread_env = SConscript('#build_common/thread.scons')
+samples_env = thread_env.Clone()
+target_os = samples_env.get('TARGET_OS')
+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',
+               '../../../../../../extlibs/boost/boost',
                '../../../../../oc_logger/include',
-               '../../../../../connectivity/lib/libcoap-4.1.1'
                ])
 
-cc = env.get('CC')
-if cc in ['gcc']:
-       samples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
-       samples_env.AppendUnique(LIBS=['-lpthread'])
-samples_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
-samples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+compiler = samples_env.get('CXX')
+if 'g++' in compiler:
+       samples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
+
+samples_env.AppendUnique(RPATH = [samples_env.get('BUILD_DIR')])
+samples_env.AppendUnique(LIBPATH = [samples_env.get('BUILD_DIR')])
 
 samples_env.PrependUnique(LIBS = ['octbstack', 'ocsrm', 'connectivity_abstraction', 'coap'])
 
@@ -49,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 env.get('SECURED') == '1':
-    samples_env.AppendUnique(LIBS = ['tinydtls'])
-
 samples_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 ######################################################################
@@ -80,6 +86,6 @@ if with_ra:
        list_of_samples.append (ocremoteaccessclient)
 Alias("samples", list_of_samples)
 
-env.AppendTarget('samples')
+samples_env.AppendTarget('samples')