Imported Upstream version 1.1.0

[platform/upstream/iotivity.git] / extlibs / tinydtls / SConscript

diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript
index e547991..901a94c 100644 (file)
--- a/extlibs/tinydtls/SConscript
+++ b/extlibs/tinydtls/SConscript
@@ -31,7 +31,6 @@ if(target_os) == 'arduino':
        env.Replace(CFLAGS = env.get('CXXFLAGS'))
 
 root_dir = './'
-
 tinydtls_src_path = root_dir
 
 env.AppendUnique(CPPPATH = [root_dir])
@@ -62,12 +61,15 @@ tinydtls_src = [
 env.AppendUnique(TINYDTLS_SRC = tinydtls_src)
 
 if not env.get('RELEASE'):
-       if(target_os) not in ['android', 'arduino']:
+       if(target_os) not in ['arduino']:
                env.AppendUnique(TINYDTLS_SRC = ['debug.c'])
+       else:
+               env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 else:
        env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 
-env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE'])
+env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE', 'SHA2_USE_INTTYPES_H'])
+
 
 libtinydtls = env.StaticLibrary('libtinydtls', env.get('TINYDTLS_SRC'), OBJPREFIX='libtinydtls_')
 
@@ -76,7 +78,7 @@ libtinydtls = env.StaticLibrary('libtinydtls', env.get('TINYDTLS_SRC'), OBJPREFI
 #
 # Note:
 # Currently there is a bug in debug.h/debug.c which fails compilation
-# of tinydtls samples in release mode. This bug is being tracked in 
+# of tinydtls samples in release mode. This bug is being tracked in
 # IOT-395
 ######################################################################
 if not env.get('RELEASE'):
@@ -92,6 +94,7 @@ if not env.get('RELEASE'):
        samples_env.PrependUnique(LIBS = ['tinydtls'])
 
        Alias("samples", [dtlsserver, dtlsclient])
+
        samples_env.AppendTarget('samples')
 
 env.InstallTarget(libtinydtls, 'libtinydtls');