X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fsrc%2FSConscript;h=f6c139c119c71f7e857fb9a30fc4df2718a2041c;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20230214.171546;hp=e7daaa6e9780cc452d3153904d2d66b453405443;hpb=a214f7d5b1f3c97e4ba731577e7297f14c5ef8b9;p=platform%2Fupstream%2Fiotivity.git

diff --git a/plugins/src/SConscript b/plugins/src/SConscript
index e7daaa6..f6c139c 100644
--- a/plugins/src/SConscript
+++ b/plugins/src/SConscript
@@ -29,19 +29,25 @@ target_os = env.get('TARGET_OS')
 src_dir = env.get('SRC_DIR')
 pi_path = os.path.join(src_dir, 'plugins')
 
-print"Reading PI script"
+print("Reading PI script")
 
 ######################################################################
 # Build flags
 ######################################################################
+with_unforked_libcoap = env.get('WITH_UNFORKED_LIBCOAP')
+if with_unforked_libcoap == '1':
+    # For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded.
+    env.PrependUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+    # For bring up purposes only, the forked version will live here.
+    env.PrependUnique(CPPPATH = [os.path.join(src_dir, 'resource', 'csdk', 'connectivity', 'lib', 'libcoap-4.1.1', 'include')])
 
 env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'include'),
                               os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
                               os.path.join(src_dir, 'resource', 'c_common', 'oic_time', 'include'),
                               os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
                               os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'connectivity', 'lib', 'libcoap-4.1.1')
+                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include')
                             ])
 env.AppendUnique(CPPPATH = [ os.path.join(pi_path, 'include'),
                              os.path.join(pi_path, 'include', 'internal'),
@@ -49,7 +55,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(pi_path, 'include'),
                              os.path.join(pi_path, 'include', 'internal')
                            ])
 
-if target_os not in ['arduino', 'windows', 'winrt']:
+if target_os not in ['arduino', 'windows']:
 	env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
 
 if target_os in ['darwin','ios']:
@@ -75,8 +81,8 @@ pi_src = [
 
 env.AppendUnique(PI_SRC = pi_src)
 
-print "Include path is %s" % env.get('CPPPATH')
-print "Files path is %s" % env.get('PI_SRC')
+print("Include path is %s" % env.get('CPPPATH'))
+print("Files path is %s" % env.get('PI_SRC'))
 if target_os in ['android', 'tizen']:
 	calib = env.SharedLibrary('plugin_interface', env.get('PI_SRC'))
 else: