Commit 7d315f28 authored by Dan Mihai's avatar Dan Mihai

Minor SConscript clean-up

Reduce the redundancy between the sets of LIBS for Darwin and
Windows, in preparation for more significant changes.

Change-Id: I4aaed0527e62857127058c3b09e91da816c3f1c4
Signed-off-by: default avatarDan Mihai <>
Reviewed-on: default avatarKevin Kane <>
Reviewed-by: default avatarPhil Coval <>
Tested-by: default avatarjenkins-iotivity <>
parent 4d6c9856
......@@ -54,15 +54,20 @@ if target_os in ['windows', 'msys_nt']:
# Macro needed for Windows builds to avoid __declspec(dllexport) and __declspec(dllimport) for cJSON APIs.
tools_env.AppendUnique(CPPDEFINES = ['CJSON_HIDE_SYMBOLS'])
if target_os in ['msys_nt', 'windows']:
# octbstack.dll doesn't export all the functions called by this app, so use static LIBs instead.
tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',
'octbstack_static', 'ocsrm', 'connectivity_abstraction', 'sqlite3'])
elif target_os in ['darwin']:
tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',
'octbstack', 'ocsrm', 'connectivity_abstraction'])
if target_os not in ['darwin', 'msys_nt', 'windows']:
tools_env.PrependUnique(LIBS = ['octbstack', 'ocsrm', 'm'])
if target_os in ['darwin']:
tools_env.AppendUnique(LIBS = ['octbstack'])
# This IoTivity-internal app calls non-Public APIs, so link with LIBS intended
# for IoTivity-internal tests (such as octbstack_static).
tools_env.AppendUnique(LIBS = ['octbstack_static'])
if target_os in ['windows']:
tools_env.AppendUnique(LIBS = ['sqlite3'])
tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',
'ocsrm', 'connectivity_abstraction'])
tools_env.PrependUnique(LIBS = ['cjson'])
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