X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2FSConscript;h=5420d9898fd0fde77dc4417ac2243e6f277f5d6b;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=4bc1fdc9596ebe332f7c0f385f7647697dc5a3d2;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index 4bc1fdc..5420d98 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -98,10 +98,9 @@ if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False): liboctbstack_env.Append( RPATH = liboctbstack_env.Literal('\\$$ORIGIN')) if env.get('SECURED') == '1': - liboctbstack_env.AppendUnique(LIBS = ['tinydtls']) liboctbstack_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto']) -if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows']: +if target_os in ['android', 'linux', 'tizen', 'msys_nt', 'windows', 'tizenrt']: liboctbstack_env.PrependUnique(LIBS = ['connectivity_abstraction']) if with_ra_ibb: @@ -134,6 +133,7 @@ else: if target_os in ['tizen', 'linux']: liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid") +if target_os in ['tizen']: liboctbstack_env.ParseConfig('pkg-config --cflags --libs sqlite3') if target_os == 'arduino': @@ -172,7 +172,6 @@ if 'CLIENT' in rd_mode or 'SERVER' in rd_mode: ###################################################################### OCTBSTACK_SRC = 'stack/src/' liboctbstack_src = [ - '../../extlibs/cjson/cJSON.c', '../../extlibs/timer/timer.c', OCTBSTACK_SRC + 'ocstack.c', OCTBSTACK_SRC + 'ocpayload.c', @@ -186,8 +185,12 @@ liboctbstack_src = [ OCTBSTACK_SRC + 'oicgroup.c' ] +if target_os != 'tizenrt': + liboctbstack_src.append('../../extlibs/cjson/cJSON.c') + if with_tcp == True: liboctbstack_src.append(OCTBSTACK_SRC + 'oickeepalive.c') + liboctbstack_env.UserInstallTargetHeader('stack/include/oickeepalive.h', 'resource', 'oickeepalive.h') if 'SERVER' in rd_mode: liboctbstack_src.append(OCTBSTACK_SRC + 'oicresourcedirectory.c') @@ -212,7 +215,7 @@ else: octbstack_libs = Flatten(static_liboctbstack) -if target_os not in ['arduino','darwin','ios'] : +if target_os not in ['arduino','darwin','ios','tizenrt'] : shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src) octbstack_libs += Flatten(shared_liboctbstack) liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h')