Commit c32ab394 authored by Dan Mihai's avatar Dan Mihai

Windows: Remove octbstack_static.lib

octbstack_static.lib was identical to octbstack_internal.lib.

IoTivity sample apps and apps outside IoTivity are using
octbstack.lib, so they don't need octbstack_internal.lib.

Change-Id: I6ffef4ba6ee1ea90e852c707a6c58a7f8e93c1f9
Signed-off-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19163Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
parent a7d4fb34
...@@ -79,7 +79,7 @@ if sptest_env.get('MULTIPLE_OWNER') == '1': ...@@ -79,7 +79,7 @@ if sptest_env.get('MULTIPLE_OWNER') == '1':
sptest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER']) sptest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
if target_os in ['msys_nt', 'windows']: if target_os in ['msys_nt', 'windows']:
sptest_env.AppendUnique(LIBS = ['octbstack_static', 'sqlite3']) sptest_env.AppendUnique(LIBS = ['octbstack_internal', 'sqlite3'])
else: else:
sptest_env.AppendUnique(LIBS = ['octbstack']) sptest_env.AppendUnique(LIBS = ['octbstack'])
if target_os in ['linux', 'tizen']: if target_os in ['linux', 'tizen']:
......
...@@ -61,8 +61,8 @@ else: ...@@ -61,8 +61,8 @@ else:
tools_env.AppendUnique(LIBS = ['octbstack']) tools_env.AppendUnique(LIBS = ['octbstack'])
else: else:
# This IoTivity-internal app calls non-Public APIs, so link with LIBS intended # This IoTivity-internal app calls non-Public APIs, so link with LIBS intended
# for IoTivity-internal tests (such as octbstack_static). # for IoTivity-internal tests (such as octbstack_internal).
tools_env.AppendUnique(LIBS = ['octbstack_static']) tools_env.AppendUnique(LIBS = ['octbstack_internal'])
if target_os in ['windows']: if target_os in ['windows']:
tools_env.AppendUnique(LIBS = ['sqlite3']) tools_env.AppendUnique(LIBS = ['sqlite3'])
tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto', tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',
......
...@@ -73,7 +73,7 @@ if srmtest_env.get('MULTIPLE_OWNER') == '1': ...@@ -73,7 +73,7 @@ if srmtest_env.get('MULTIPLE_OWNER') == '1':
srmtest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER']) srmtest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
if target_os == 'windows': if target_os == 'windows':
srmtest_env.AppendUnique(LIBS = ['octbstack_static', 'sqlite3']) srmtest_env.AppendUnique(LIBS = ['octbstack_internal', 'sqlite3'])
else: else:
# TODO: Implement feature check. # TODO: Implement feature check.
srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R']) srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R'])
......
...@@ -234,13 +234,9 @@ else: ...@@ -234,13 +234,9 @@ else:
octbstack_libs = Flatten(test_liboctbstack) octbstack_libs = Flatten(test_liboctbstack)
if target_os in ['windows', 'msys_nt']: if target_os not in ['windows', 'msys_nt']:
# Avoid a name conflict with the octbstack.lib target of the SharedLibrary.
static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_static', liboctbstack_src)
else:
static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src) static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src)
octbstack_libs += Flatten(static_liboctbstack)
octbstack_libs += Flatten(static_liboctbstack)
if target_os not in ['arduino','darwin','ios'] : if target_os not in ['arduino','darwin','ios'] :
shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src) shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment