X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fthird_party_libs.scons;h=f5d709fdcc8c9ca55d081598144168bea0bfa0c7;hb=9e43a4496b0418a31b93e45643df4975a8ca4619;hp=6fda8506a907c8be19339e7dab12a3b28ce3f555;hpb=806b994263369d28941aa1495a0a3b54d5249cd5;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons index 6fda850..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 ''' @@ -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' ]) @@ -78,11 +78,11 @@ if target_os == 'android': if target_arch == 'armeabi-v7a-hard': target_arch = 'armeabi-v7a' - if target_arch not in ['x86', 'x86_64','armeabi', 'armeabi-v7a']: + if target_arch not in ['x86', 'armeabi', 'armeabi-v7a']: if not env.GetOption('help') and not env.GetOption('clean'): print ''' *********************************** Warning *********************************** -* current only x86, x86_64, armeabi, armeabi-v7a libraries are provided! * +* current only x86, armeabi, armeabi-v7a libraries are provided! * ******************************************************************************* ''' else: @@ -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'))