X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fthird_party_libs.scons;h=f5d709fdcc8c9ca55d081598144168bea0bfa0c7;hb=cb32b2c7eebd5807b081bb44acaa4d27e94dd5a9;hp=3a79908a5901b56b5438860b15c6451157f41c00;hpb=9015fb1a75f3b43b57153b840f73a2ebc4bb8a63;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index 3a79908..f5d709f 100644
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -37,7 +37,7 @@ 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 '''
@@ -49,15 +49,15 @@ if target_os in ['linux', 'tizen']:
 
 		conf = Configure(lib_env)
 
-		if not conf.CheckLib('boost_thread'):
+		if target_os not in ['tizen'] and not conf.CheckLib('boost_thread', language='C++'):
 			print 'Did not find boost_thread, exiting!'
 			Exit(1)
 
-		if not conf.CheckLib('boost_system'):
+		if target_os not in ['tizen'] and not conf.CheckLib('boost_system', language='C++'):
 			print 'Did not find boost_system, exiting!'
 			Exit(1)
 
-		conf.Finish()
+		lib_env = conf.Finish()
 
 ######################################################################
 # The 'include' path of external libraries
@@ -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'
 		])
 
@@ -90,10 +90,14 @@ if target_os == 'android':
 		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'))