projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add external package management support
[platform/upstream/iotivity.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index
fd1b034
..
0a82963
100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-6,13
+6,18
@@
# Load common build config
SConscript('build_common/SConscript')
# Load common build config
SConscript('build_common/SConscript')
-# Load extra options
-SConscript('extra_options.scons')
Import('env')
target_os = env.get('TARGET_OS')
if target_os == 'arduino':
SConscript('arduino.scons')
Import('env')
target_os = env.get('TARGET_OS')
if target_os == 'arduino':
SConscript('arduino.scons')
+else:
+ # Prepare libraries
+ env.PrepareLib('cereal')
+ env.PrepareLib('expat')
+ env.PrepareLib('boost', 'boost_thread', env.get('SRC_DIR') + '/extlibs/boost/')
+ env.PrepareLib('boost', 'boost_system', env.get('SRC_DIR') + '/extlibs/boost/')
+
# By default, src_dir is current dir, the build_dir is:
# ./out/<target_os>/<target_arch>/<release or debug>/
#
# By default, src_dir is current dir, the build_dir is:
# ./out/<target_os>/<target_arch>/<release or debug>/
#
@@
-28,7
+33,7
@@
build_dir = env.get('BUILD_DIR')
SConscript(build_dir + 'resource/SConscript')
# Build 'service' sub-project
SConscript(build_dir + 'resource/SConscript')
# Build 'service' sub-project
-
#
SConscript(build_dir + 'service/SConscript')
+SConscript(build_dir + 'service/SConscript')
# Append targets information to the help information, to see help info, execute command line:
# $ scon [options] -h
# Append targets information to the help information, to see help info, execute command line:
# $ scon [options] -h