X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fthird_party_libs.scons;h=2e347c9497d4c1c92901b08add244d139bca276a;hb=1ab059711996bb22d79484f57ea94e9e8dc5d661;hp=6ddeebcaf1a71c0c7b4d6a9ae576766269d167f0;hpb=8ba440a073c2b5496cfaa5e5606353dad515e3c0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index 6ddeebc..2e347c9 100644
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -37,24 +37,24 @@ resource_path = src_dir + '/resource'
 ######################################################################
 # Check dependent packages (Linux only)
 ######################################################################
-if target_os in ['linux', 'tizen']:
+if target_os in ['linux']:
 	if not env.GetOption('help'):
 		if not target_arch == platform.machine():
-			print '''
+			print('''
 *********************************** Warning ***********************************
 * You are trying cross build, please make sure (%s) version libraries are
 * installed!       	                                                      *
 *******************************************************************************
-''' % target_arch
+''' % target_arch)
 
 		conf = Configure(lib_env)
 
 		if target_os not in ['tizen'] and not conf.CheckLib('boost_thread', language='C++'):
-			print 'Did not find boost_thread, exiting!'
+			print('Did not find boost_thread, exiting!')
 			Exit(1)
 
 		if target_os not in ['tizen'] and not conf.CheckLib('boost_system', language='C++'):
-			print 'Did not find boost_system, exiting!'
+			print('Did not find boost_system, exiting!')
 			Exit(1)
 
 		lib_env = conf.Finish()
@@ -67,7 +67,7 @@ lib_env.AppendUnique(CPPPATH = [
 		resource_path + '/include' ,
 		resource_path + '/oc_logger/include',
 		resource_path + '/csdk/stack/include',
-		resource_path + '/csdk/ocrandom/include',
+		resource_path + '/c_common/ocrandom/include',
 		resource_path + '/csdk/logger/include'
 		])
 
@@ -80,20 +80,24 @@ if target_os == 'android':
 
 	if target_arch not in ['x86', 'armeabi', 'armeabi-v7a']:
 		if not env.GetOption('help') and not env.GetOption('clean'):
-			print '''
+			print('''
 *********************************** Warning ***********************************
 * current only x86, armeabi, armeabi-v7a libraries are provided!              *
 *******************************************************************************
-'''
+''')
 	else:
 		# Too much boost warning, suppress the warning
 		lib_env.AppendUnique(CCFLAGS = ['-w'])
 
 elif target_os == 'ios':
-	lib_env.AppendUnique(FRAMEWORKS = ['boost', 'expat', 'openssl'])
+	lib_env.AppendUnique(FRAMEWORKPATH = [src_dir + '/extlibs/boost/ios/framework'])
+	lib_env.AppendUnique(FRAMEWORKS = ['boost'])
 elif target_os == 'darwin':
 	lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])
 	lib_env.AppendUnique(LIBPATH = ['/usr/local/lib'])
+elif target_os == 'windows':
+	boost_path = os.path.join(src_dir,'extlibs','boost','boost')
+	lib_env.AppendUnique(CPPPATH = [boost_path])
 
 Import('env')
 lib_env.AppendUnique(LIBPATH = env.get('BUILD_DIR'))