X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fbuild%2Ftizen%2Fscons%2FSConscript;h=621a39dc4f99a4720070f4c8463ff525d757c25d;hb=refs%2Ftags%2Fsubmit%2Ftizen_4.0%2F20171010.021147;hp=318d954e44b77274c7d6e12b77e087065e02f257;hpb=ac8ffa40df98b2238be21c4bc3703cfa45e7871d;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/build/tizen/scons/SConscript b/resource/csdk/connectivity/build/tizen/scons/SConscript
old mode 100755
new mode 100644
index 318d954..621a39d
--- a/resource/csdk/connectivity/build/tizen/scons/SConscript
+++ b/resource/csdk/connectivity/build/tizen/scons/SConscript
@@ -1,3 +1,4 @@
+# -*- mode: python; python-indent-offset: 4; indent-tabs-mode: nil -*-
 ##
 # 'resource' sub-project main build script
 #
@@ -7,6 +8,7 @@ Import('env')
 
 target_os = env.get('TARGET_OS')
 transport = env.get('TARGET_TRANSPORT')
+with_tcp = env.get('WITH_TCP')
 
 print "Given Transport is %s" % transport
 
@@ -16,9 +18,12 @@ else:
 	env.AppendUnique(CFLAGS = ['-std=c99', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE'])
 
 if env.get('LOGGING'):
-	env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+    env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+
+env.ParseConfig("pkg-config --cflags --libs capi-network-connection dlog glib-2.0")
+if env.get('OIC_SUPPORT_TIZEN_TRACE') == 'True':
+    env.ParseConfig("pkg-config --cflags --libs ttrace")
 
-env.ParseConfig("pkg-config --cflags --libs capi-network-wifi dlog glib-2.0")
 if 'ALL' in transport:
 		env.AppendUnique(CPPDEFINES = ['WIFI_ADAPTER', 'NO_ETHERNET_ADAPTER','EDR_ADAPTER','LE_ADAPTER'])
 		print "CA Transport is ALL"
@@ -41,6 +46,14 @@ else:
 	else:
 		env.AppendUnique(CPPDEFINES = ['NO_WIFI_ADAPTER'])
 
+	if with_tcp == True:
+		env.AppendUnique(CPPDEFINES = ['TCP_ADAPTER'])
+		print "CA Transport is TCP"
+	else:
+		env.AppendUnique(CPPDEFINES = ['NO_TCP_ADAPTER'])
+
 
 env.SConscript(['../con/lib/libcoap-4.1.1/SConscript'])
 env.SConscript(['../con/SConscript'])
+env.SConscript(['../con/c_common/SConscript'])
+env.SConscript(['../con/logger/SConscript'])