projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build error with scons-4.4.0 version which is based on python3
[platform/upstream/iotivity.git]
/
resource
/
third_party_libs.scons
diff --git
a/resource/third_party_libs.scons
b/resource/third_party_libs.scons
index
46b80bd
..
06d7c78
100644
(file)
--- a/
resource/third_party_libs.scons
+++ b/
resource/third_party_libs.scons
@@
-36,15
+36,15
@@
src_dir = env.get('SRC_DIR')
######################################################################
# Check dependent packages (Linux only)
######################################################################
######################################################################
# 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():
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! *
*******************************************************************************
*********************************** Warning ***********************************
* You are trying cross build, please make sure (%s) version libraries are *
* installed! *
*******************************************************************************
-''' % target_arch
+''' % target_arch
)
conf = Configure(lib_env)
conf.Finish()
conf = Configure(lib_env)
conf.Finish()
@@
-59,16
+59,21
@@
if target_os == 'android':
if target_arch not in ['x86', 'armeabi', 'armeabi-v7a']:
if not env.GetOption('help') and not env.GetOption('clean'):
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! *
*******************************************************************************
*********************************** Warning ***********************************
* current only x86, armeabi, armeabi-v7a libraries are provided! *
*******************************************************************************
-'''
+'''
)
else:
# Too much boost warning, suppress the warning
lib_env.AppendUnique(CCFLAGS = ['-w'])
else:
# Too much boost warning, suppress the warning
lib_env.AppendUnique(CCFLAGS = ['-w'])
+elif target_os in ['windows']:
+ SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'boost', 'SConscript'))
+ boost_path = os.path.join(src_dir,'extlibs','boost','boost')
+ lib_env.AppendUnique(CPPPATH = [boost_path])
elif target_os == 'ios':
elif target_os == 'ios':
+ 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(FRAMEWORKS = ['boost'])
elif target_os == 'darwin':
lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])