X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2FSConscript;h=1abd0ce3d266081f912109029de7649aa25b82c5;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=c229051a8541be2f262b4386f74efe04e45867cb;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index c229051..1abd0ce 100644
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -8,6 +8,7 @@ Import('env')
 ca_os = env.get('TARGET_OS')
 ca_transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
+with_mbedtls_static = env.get('WITH_MBEDTLS_STATIC_LIB');
 multiple_owner = env.get('MULTIPLE_OWNER')
 with_ra = env.get ('WITH_RA')
 with_ra_ibb = env.get('WITH_RA_IBB')
@@ -34,9 +35,12 @@ else:
 	env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'lib', 'libcoap-4.1.1', 'include')])
 
 env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
+                             os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
                              os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
                              os.path.join(root_dir, 'common', 'inc'),
-                             os.path.join(root_dir, 'util', 'inc') ])
+                             os.path.join(root_dir, '/usr', 'include','glib-2.0'),
+                             os.path.join(root_dir, '/usr', 'lib','glib-2.0', 'include'),
+                             os.path.join(root_dir, 'util', 'inc')])
 
 if ca_os not in ['arduino', 'windows']:
 	env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
@@ -53,9 +57,6 @@ env.SConscript(os.path.join(root_dir, 'common', 'SConscript'))
 # Getting util source files
 env.SConscript(os.path.join(root_dir, 'util', 'SConscript'))
 
-# The tinydtls library is found in '#extlibs/tinydtls', where the '#'
-# is interpreted by SCons as the top-level iotivity directory where
-# the SConscruct file is found.
 build_dir = env.get('BUILD_DIR')
 
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
@@ -66,8 +67,6 @@ if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
                                           'adapter_util/cafragmentation.c')])
 
 if env.get('SECURED') == '1':
-	env.SConscript(build_dir + 'extlibs/tinydtls/SConscript')
-	env.AppendUnique(CPPPATH = ['#extlibs/tinydtls'])
 	env.SConscript(build_dir + 'extlibs/timer/SConscript')
 	env.AppendUnique(CPPPATH = ['#extlibs/timer'])
 	env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include'])
@@ -79,7 +78,7 @@ if env.get('SECURED') == '1':
 		env.SConscript(os.path.join(root_dir, tls_path + '/SConscript'))
 		env.AppendUnique(CPPPATH = [os.path.join(root_dir, tls_path + '/' + tls_headers_path)])
 	else:
-		if ca_os != 'android':
+		if ca_os != 'android' and env.get('PLATFORM_TLS') == '0':
 			env.SConscript('#' + tls_path + '/SConscript')
 		env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path])
 		env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
@@ -88,7 +87,7 @@ if ((secured == '1') and (with_tcp == True)):
 	env.AppendUnique(CPPDEFINES = ['__WITH_TLS__'])
 
 if (multiple_owner == '1'):
-	env.AppendUnique(CPPDEFINES=['_ENABLE_MULTIPLE_OWNER_'])
+	env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
 
 
 ca_common_src = None
@@ -180,7 +179,7 @@ if 'BLE' in ca_transport:
 if 'NFC' in ca_transport:
 	env.SConscript(os.path.join(ca_path, 'nfc_adapter/SConscript'))
 
-if ca_os in ['linux', 'tizen', 'android', 'ios']:
+if ca_os in ['linux', 'tizen', 'android', 'ios', 'tizenrt']:
 	if with_tcp == True:
 		env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
 		env.AppendUnique(CPPDEFINES = ['WITH_TCP'])
@@ -201,24 +200,29 @@ if env.get('LOGGING'):
 if ca_os == 'android':
 	lib_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libconnectivity_abstraction.so'])
 
-if ca_os in ['android', 'tizen', 'linux']:
-	lib_env.AppendUnique(LIBS = ['coap'])
-	if lib_env.get('SECURED') == '1':
+if lib_env.get('SECURED') == '1':
+	if ca_os in ['windows', 'msys_nt', 'ios']:
 		lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 		lib_env.AppendUnique(LIBS = ['timer'])
-	if ca_os != 'android':
-		lib_env.AppendUnique(LIBS = ['rt'])
-		if ((lib_env.get('SECURED') == '1') and ((lib_env.get('WITH_TCP')) or (lib_env.get('WITH_CLOUD')))):
+	else:
+		if with_mbedtls_static == '1':
 			lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 			lib_env.AppendUnique(LIBS = ['timer'])
+		else:
+			lib_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')])
+			lib_env.AppendUnique(RPATH = [lib_env.get('BUILD_DIR')])
+			lib_env.PrependUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
+			lib_env.PrependUnique(LIBS = ['timer'])
+
+if ca_os in ['android', 'tizen', 'linux']:
+	lib_env.AppendUnique(LIBS = ['coap'])
+	if ca_os != 'android':
+		lib_env.AppendUnique(LIBS = ['rt'])
 	static_calib = lib_env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 	shared_calib = lib_env.SharedLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
 	calib = Flatten([static_calib, shared_calib])
 elif ca_os in ['msys_nt', 'windows']:
 	lib_env.AppendUnique(LIBS = ['coap', 'mswsock', 'ws2_32', 'iphlpapi', 'logger'])
-	if lib_env.get('SECURED') == '1':
-		lib_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
-		lib_env.AppendUnique(LIBS = ['timer'])
 	calib = lib_env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 else:
 	calib = lib_env.StaticLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))