From 6e4db2c78d627c75487ab89da34833d67b83198a Mon Sep 17 00:00:00 2001 From: David Antler Date: Tue, 26 Apr 2016 11:43:29 -0700 Subject: [PATCH] Add source files to tinydtls SConscript Debug options were being stored in an environment variable, which is the old way of doing things. Change-Id: Ia525707f6cba918b209b9f94323fa49082577592 Signed-off-by: David Antler Reviewed-on: https://gerrit.iotivity.org/gerrit/7933 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- extlibs/tinydtls/SConscript | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript index 4fd4781..5d186a2 100644 --- a/extlibs/tinydtls/SConscript +++ b/extlibs/tinydtls/SConscript @@ -60,20 +60,18 @@ tinydtls_src = [ 'sha2/sha2.c', ] -dtls_env.AppendUnique(TINYDTLS_SRC = tinydtls_src) - if not dtls_env.get('RELEASE'): if(target_os) not in ['arduino']: - dtls_env.AppendUnique(TINYDTLS_SRC = ['debug.c']) + tinydtls_src += ['debug.c'] else: dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG']) else: dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG']) dtls_env.AppendUnique(CPPDEFINES = ['DTLSV12', 'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE', 'SHA2_USE_INTTYPES_H']) +env.AppendUnique(CPPDEFINES = ['SHA2_USE_INTTYPES_H']) - -libtinydtls = dtls_env.StaticLibrary('libtinydtls', dtls_env.get('TINYDTLS_SRC'), OBJPREFIX='libtinydtls_') +libtinydtls = dtls_env.StaticLibrary('tinydtls', tinydtls_src, OBJPREFIX='libtinydtls_') ###################################################################### # Generate tinydtls samples @@ -99,5 +97,5 @@ if not env.get('RELEASE'): samples_env.AppendTarget('samples') -dtls_env.InstallTarget(libtinydtls, 'libtinydtls'); +dtls_env.InstallTarget(libtinydtls, 'tinydtls'); -- 2.7.4