X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build_common%2Fexternal_libs.scons;h=85550d0a07308b516c243714c2c11c1f1f9e5aec;hb=1d58f8510f39102a12461437915640cec1dbcf4b;hp=8ab0cd43cf959cbb38186e9637395ee0a8c466e4;hpb=b2f2076a79aee404a8c01d2d01e576fce780558d;p=platform%2Fupstream%2Fiotivity.git diff --git a/build_common/external_libs.scons b/build_common/external_libs.scons index 8ab0cd4..85550d0 100644 --- a/build_common/external_libs.scons +++ b/build_common/external_libs.scons @@ -28,6 +28,7 @@ Import('env') target_os = env.get('TARGET_OS') target_arch = env.get('TARGET_ARCH') +rd_mode = env.get('RD_MODE') # for android, doesn't distinguish 'armeabi-v7a-hard' and 'armeabi-v7a' library if target_os == 'android': @@ -40,8 +41,9 @@ if target_os == 'darwin': # External library include files are in /deps//include # the library binaries are in /deps//lib/ -env.AppendUnique(CPPPATH = [os.path.join(env.get('SRC_DIR'), 'deps', target_os, 'include')]) -env.AppendUnique(LIBPATH = [os.path.join(env.get('SRC_DIR'), 'deps', target_os, 'lib', target_arch)]) +if target_os not in ['windows']: + env.AppendUnique(CPPPATH = [os.path.join(env.get('SRC_DIR'), 'deps', target_os, 'include')]) + env.AppendUnique(LIBPATH = [os.path.join(env.get('SRC_DIR'), 'deps', target_os, 'lib', target_arch)]) # Check whether a library exists, if not, notify user to install it or try to # download the source code and build it @@ -128,6 +130,10 @@ with_ra = env.get('WITH_RA') if with_ra: SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'raxmpp', 'SConscript')) +with_ra_ibb = env.get('WITH_RA_IBB') +if with_ra_ibb: + SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'wksxmppxep', 'SConscript')) + env.AddMethod(__prepare_lib, "PrepareLib") env.AddMethod(__configure, "Configure") @@ -135,5 +141,6 @@ env.AddMethod(__download, "Download") env.AddMethod(__install_head_file, "InstallHeadFile") env.AddMethod(__install_lib, "InstallLib") -if env.get('SECURED') == '1': - SConscript(os.path.join(env.get('SRC_DIR'), 'extlibs', 'sqlite3', 'SConscript')) \ No newline at end of file +if env.get('SECURED') == '1' or 'SERVER' in rd_mode: + if target_os not in ['linux', 'tizen']: + SConscript('#extlibs/sqlite3/SConscript')