X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=SConstruct;h=0a829631c57f6654e46c649a5cfe2c1d1219b2f3;hb=38f5e9d1bee8eb61494a3acbf053a3b6d5c2b779;hp=fd1b03484b4a2d3873d414bbfbaf25af2c0c7853;hpb=1e0a58c84d416bab6fdfbc2cf6175c2c7b150e09;p=platform%2Fupstream%2Fiotivity.git

diff --git a/SConstruct b/SConstruct
index fd1b034..0a82963 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,13 +6,18 @@
 # 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')
+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>/
 #
@@ -28,7 +33,7 @@ build_dir = env.get('BUILD_DIR')
 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