projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update snapshot history" into tizen
[platform/upstream/iotivity.git]
/
service
/
third_party_libs.scons
diff --git
a/service/third_party_libs.scons
b/service/third_party_libs.scons
index
6ddeebc
..
f5d709f
100644
(file)
--- 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)
######################################################################
######################################################################
# 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 '''
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 + '/include' ,
resource_path + '/oc_logger/include',
resource_path + '/csdk/stack/include',
- resource_path + '/c
sdk
/ocrandom/include',
+ resource_path + '/c
_common
/ocrandom/include',
resource_path + '/csdk/logger/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(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 == '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'))
Import('env')
lib_env.AppendUnique(LIBPATH = env.get('BUILD_DIR'))