Imported Upstream version 1.2.0

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

diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript
index 9bb9569..871e7a9 100644 (file)
--- a/resource/csdk/security/tool/SConscript
+++ b/resource/csdk/security/tool/SConscript
@@ -26,20 +26,27 @@ src_dir = tools_env.get('SRC_DIR')
 ######################################################################
 # Build flags
 ######################################################################
+with_upstream_libcoap = tools_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.
+    tools_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+    # For bring up purposes only, the forked version will live here.
+    tools_env.AppendUnique(CPPPATH = ['../../connectivity/lib/libcoap-4.1.1/include'])
+
 tools_env.PrependUnique(CPPPATH = ['../../../../extlibs/cjson',
                                   '../../stack/include',
                                   '../../stack/include/internal',
                                   '../../logger/include',
                                   '../../../oc_logger/include',
                                   '../../connectivity/api',
+                                  '../../connectivity/inc/pkix',
                                   '../include',
-                                  '../include/internal',
-                                  '../../connectivity/lib/libcoap-4.1.1',
-
+                                  '../include/internal'
                                   ])
 tools_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x'])
-tools_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-tools_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
+tools_env.AppendUnique(LIBPATH = [tools_env.get('BUILD_DIR')])
+tools_env.AppendUnique(RPATH = [tools_env.get('BUILD_DIR')])
 tools_env.PrependUnique(LIBS = ['oc', 'octbstack'])
 
 ######################################################################