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

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index e9a140c..f5d709f 100644
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -1,3 +1,23 @@
+#******************************************************************
+#
+# Copyright 2014 Samsung Electronics All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 ######################################################################
 # This script manages third party libraries
 #
@@ -12,15 +32,12 @@ target_os = env.get('TARGET_OS')
 target_arch = env.get('TARGET_ARCH')
 src_dir = env.get('SRC_DIR')
 
-if target_os not in ['linux', 'darwin']:
-	utils_path = env.get('OIC_UTILS')
-
 resource_path = src_dir + '/resource'
 
 ######################################################################
 # Check dependent packages (Linux only)
 ######################################################################
-if target_os == 'linux':
+if target_os in ['linux']:
 	if not env.GetOption('help'):
 		if not target_arch == platform.machine():
 			print '''
@@ -32,15 +49,15 @@ if target_os == 'linux':
 
 		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
@@ -50,22 +67,11 @@ lib_env.AppendUnique(CPPPATH = [
 		resource_path + '/include' ,
 		resource_path + '/oc_logger/include',
 		resource_path + '/csdk/stack/include',
-		resource_path + '/csdk/ocsocket/include',
-		resource_path + '/csdk/ocrandom/include',
+		resource_path + '/c_common/ocrandom/include',
 		resource_path + '/csdk/logger/include'
 		])
 
 ######################################################################
-# The 'include' path of third party libraries
-######################################################################
-if target_os == 'android':
-	lib_env.AppendUnique(CPPPATH = [
-					utils_path + '/android/boost/include',
-					utils_path + '/android/expat/include/expat/',
-					utils_path + '/android/openssl/include',
-				])
-
-######################################################################
 # The path of third party libraries binary
 ######################################################################
 if target_os == 'android':
@@ -80,20 +86,19 @@ if target_os == 'android':
 *******************************************************************************
 '''
 	else:
-		lib_env.AppendUnique(LIBPATH = [
-								utils_path + '/android/boost/libs/' + target_arch,
-								utils_path + '/android/expat/lib/' + target_arch,
-								utils_path + '/android/openssl/lib/' + target_arch,
-							])
 		# Too much boost warning, suppress the warning
 		lib_env.AppendUnique(CCFLAGS = ['-w'])
 
 elif target_os == 'ios':
-	lib_env.AppendUnique(FRAMEWORKPATH = [utils_path + '/ios/frameworks/'])
-	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'))
+