From: KIM JungYong Date: Mon, 23 Jan 2017 11:29:36 +0000 (+0900) Subject: [Easy-setup] Enable to build of tizen mediator. X-Git-Tag: 1.3.0~776 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e7a3d2eb8540fbe1a2433b7e7dd6954aee6a101;p=platform%2Fupstream%2Fiotivity.git [Easy-setup] Enable to build of tizen mediator. When building of Easy-setup for tizen, mediator was not built before. In this patch mediator api for tizen will be build. Change-Id: I215a81c414c039777d8c9a918f2840cbfb4bb471 Signed-off-by: KIM JungYong Reviewed-on: https://gerrit.iotivity.org/gerrit/16699 Reviewed-by: Jihun Ha Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript index e1bef6d..1531163 100755 --- a/service/easy-setup/mediator/richsdk/SConscript +++ b/service/easy-setup/mediator/richsdk/SConscript @@ -62,7 +62,7 @@ easy_setup_env.AppendUnique(CPPPATH = ['inc', 'src', '../../inc']) if target_os not in ['windows']: easy_setup_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) -if target_os in ['linux']: +if target_os in ['linux','tizen']: easy_setup_env.AppendUnique(LIBS = ['pthread', 'dl', 'coap']) if target_os in ['android']: @@ -77,7 +77,7 @@ if target_os in ['android']: if not env.get('RELEASE'): easy_setup_env.AppendUnique(LIBS = ['log']) -if target_os in ['linux']: +if target_os in ['linux','tizen']: easy_setup_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) easy_setup_env.AppendUnique(RPATH = [env.get('BUILD_DIR')]) easy_setup_env.AppendUnique(CXXFLAGS = ['-pthread']) @@ -85,7 +85,7 @@ if target_os in ['linux']: if env.get('SECURED') == '1': easy_setup_env.AppendUnique(LIBS = ['ocpmapi', 'ocprovision']) -if target_os in ['android','linux']: +if target_os in ['android','linux','tizen']: easy_setup_env.PrependUnique(CPPPATH = [ env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include', env.get('SRC_DIR') + '/resource/include', @@ -128,7 +128,7 @@ print"easysetup_path %s" % easysetup_path es_src = None -if target_os in ['android','linux']: +if target_os in ['android','linux','tizen']: if env.get('SECURED') == '1': env.AppendUnique(es_src = [os.path.join(easysetup_path, 'src/EnrolleeSecurity.cpp')])