Merge branch 'master' into extended-easysetup

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

diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript
index 4fd4781..0d1bf93 100644 (file)
--- a/extlibs/tinydtls/SConscript
+++ b/extlibs/tinydtls/SConscript
@@ -40,9 +40,6 @@ dtls_env.AppendUnique(CPPPATH = [root_dir+'aes/'])
 dtls_env.AppendUnique(CPPPATH = [root_dir+'ecc/'])
 dtls_env.AppendUnique(CPPPATH = [root_dir+'sha2/'])
 
-if target_os not in ['arduino', 'windows', 'winrt']:
-       dtls_env.AppendUnique(CPPDEFINES = ['HAVE_SYS_TIME_H'])
-
 ######################################################################
 # Source files and Target(s)
 ######################################################################
@@ -60,20 +57,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
@@ -86,7 +81,7 @@ libtinydtls = dtls_env.StaticLibrary('libtinydtls', dtls_env.get('TINYDTLS_SRC')
 if not env.get('RELEASE'):
        samples_env = dtls_env.Clone()
 
-       if target_os not in ['arduino', 'windows', 'winrt']:
+       if target_os not in ['arduino', 'windows']:
                samples_env.AppendUnique(CPPDEFINES = ['_GNU_SOURCE'])
 
        dtlsserver = samples_env.Program('dtls-server', ['tests/dtls-server.c'])
@@ -95,9 +90,12 @@ if not env.get('RELEASE'):
        samples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
        samples_env.PrependUnique(LIBS = ['tinydtls'])
 
+       if target_os in ['windows', 'msys_nt']:
+               samples_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'advapi32'])
+
        Alias("samples", [dtlsserver, dtlsclient])
 
        samples_env.AppendTarget('samples')
 
-dtls_env.InstallTarget(libtinydtls, 'libtinydtls');
+dtls_env.InstallTarget(libtinydtls, 'tinydtls');