X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=resource%2Fcsdk%2Fstack%2Fsamples%2Ftizen%2FSimpleClientServer%2Fscons%2FSConscript;h=8fd0e1b7c577d38a93ee2f487f9a5f97e173cf88;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=509fec35aeaf5f3027ab98626eaaa51b1658a457;hpb=ed0bcb17d4860408dfb86f544da9b66ec925b2ca;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
index 509fec3..8fd0e1b 100644
--- a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
+++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
@@ -24,12 +24,15 @@ target_os = env.get('TARGET_OS')
 transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
 routing = env.get('ROUTING')
+with_mq = env.get('WITH_MQ')
 OIC_LIB = 'oic'
 root_dir = env.get('ROOT_DIR')
 build_dir = env.get('BUILD_DIR')
 sample_dir = build_dir
 
-env.AppendUnique(CPPFLAGS = ['-std=c++0x', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog', 'com.oic.ri', 'capi-network-wifi',
+print "MQ flag is %s" % with_mq
+
+env.AppendUnique(CPPFLAGS = ['-std=c++0x', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog', 'com.oic.ri', 'capi-network-connection',
 				'gobject-2.0','glib-2.0`'])
 
 if routing == 'GW':
@@ -37,18 +40,23 @@ if routing == 'GW':
 elif routing == 'EP':
 	env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 
+if env.get('WITH_PROXY'):
+	env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
+	
 env.Append(LIBS=[
-  '-lm', '-lpthread', '-lrt', '-ldl', '-lstdc++', '-lgobject-2.0', '-lgio-2.0', '-lglib-2.0', '-lcapi-network-wifi', '-ldlog', '-lcapi-network-bluetooth', '-lconnectivity_abstraction', 'coap', '-loctbstack', 'ocsrm', 'c_common'
+  'm', 'pthread', 'rt', 'dl', 'stdc++', 'gobject-2.0', 'gio-2.0', 'glib-2.0', 'capi-network-connection', 'dlog', 'capi-network-bluetooth', 'connectivity_abstraction', 'coap', 'octbstack', 'ocsrm', 'c_common'
 ])
 
 if secured == '1':
 	env.PrependUnique(CPPPATH = [root_dir + '/external/inc/'])
 	env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
-	env.Append(LIBS=['-ltinydtls'])
+	env.Append(LIBS=['mbedtls', 'mbedx509','mbedcrypto'])
 
 if 'ALL' in transport:
-		env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','EDR_ADAPTER','LE_ADAPTER','BT_ADAPTER_TEST','BLE_ADAPTER_TEST'])
-		print "CA Transport is ALL"
+	env.AppendUnique(CPPDEFINES = ['IP_ADAPTER','EDR_ADAPTER','LE_ADAPTER','BT_ADAPTER_TEST','BLE_ADAPTER_TEST'])
+	print "CA Transport is ALL"
+	if env.get('WITH_TCP'):
+		env.AppendUnique(CPPDEFINES = ['TCP_ADAPTER', 'WITH_TCP'])
 else:
 	if 'BT' in transport:
 		env.AppendUnique(CPPDEFINES = ['EDR_ADAPTER','BT_ADAPTER_TEST'])
@@ -68,6 +76,23 @@ else:
 	else:
 		env.AppendUnique(CPPDEFINES = ['NO_IP_ADAPTER'])
 
+	if env.get('WITH_TCP'):
+		env.AppendUnique(CPPDEFINES = ['TCP_ADAPTER', 'WITH_TCP'])
+	else:
+		env.AppendUnique(CPPDEFINES = ['NO_TCP_ADAPTER'])
+
+if 'SUB' in with_mq:
+	env.AppendUnique(CPPDEFINES = ['MQ_SUBSCRIBER', 'WITH_MQ'])
+	print "MQ SUB support"
+
+if 'PUB' in with_mq:
+	env.AppendUnique(CPPDEFINES = ['MQ_PUBLISHER', 'WITH_MQ'])
+	print "MQ PUB support"
+
+if 'BROKER' in with_mq:
+	env.AppendUnique(CPPDEFINES = ['MQ_BROKER', 'WITH_MQ'])
+	print "MQ Broker support"
+
 #ri_sample_src = [sample_dir + '/occlient.cpp']
 
 #print " ri sample src %s" % ri_sample_src