X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=extlibs%2Ftinydtls%2FSConscript;h=82aafeb1f78e4b60006c056f47a9e6178e9dd1f6;hb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;hp=4c6b4e17e26ed5e4fdf4ed9e18f3f1fb85920ab0;hpb=068b9d878cead4b54ceaba89cb9d9c19b1c5dcb1;p=platform%2Fupstream%2Fiotivity.git

diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript
index 4c6b4e1..82aafeb 100644
--- a/extlibs/tinydtls/SConscript
+++ b/extlibs/tinydtls/SConscript
@@ -31,16 +31,14 @@ if(target_os) == 'arduino':
 	env.Replace(CFLAGS = env.get('CXXFLAGS'))
 
 root_dir = './'
-
 tinydtls_src_path = root_dir
 
-env.AppendUnique(CPPPATH = [root_dir])
-env.AppendUnique(CPPPATH = [root_dir+'aes/'])
-env.AppendUnique(CPPPATH = [root_dir+'ecc/'])
-env.AppendUnique(CPPPATH = [root_dir+'sha2/'])
+dtls_env = env.Clone()
 
-if target_os not in ['arduino', 'windows', 'winrt']:
-	env.AppendUnique(CPPDEFINES = ['HAVE_SYS_TIME_H'])
+dtls_env.PrependUnique(CPPPATH = [root_dir])
+dtls_env.AppendUnique(CPPPATH = [root_dir+'aes/'])
+dtls_env.AppendUnique(CPPPATH = [root_dir+'ecc/'])
+dtls_env.AppendUnique(CPPPATH = [root_dir+'sha2/'])
 
 ######################################################################
 # Source files and Target(s)
@@ -59,19 +57,18 @@ tinydtls_src = [
                 'sha2/sha2.c',
         ]
 
-env.AppendUnique(TINYDTLS_SRC = tinydtls_src)
-
-if not env.get('RELEASE'):
+if not dtls_env.get('RELEASE'):
 	if(target_os) not in ['arduino']:
-		env.AppendUnique(TINYDTLS_SRC = ['debug.c'])
+		tinydtls_src += ['debug.c']
 	else:
-		env.AppendUnique(CPPDEFINES = ['NDEBUG'])
+		dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 else:
-	env.AppendUnique(CPPDEFINES = ['NDEBUG'])
+	dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 
-env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE'])
+dtls_env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE', 'SHA2_USE_INTTYPES_H'])
+env.AppendUnique(CPPDEFINES = ['SHA2_USE_INTTYPES_H'])
 
-libtinydtls = env.StaticLibrary('libtinydtls', env.get('TINYDTLS_SRC'), OBJPREFIX='libtinydtls_')
+libtinydtls = dtls_env.StaticLibrary('tinydtls', tinydtls_src, OBJPREFIX='libtinydtls_')
 
 ######################################################################
 # Generate tinydtls samples
@@ -82,9 +79,9 @@ libtinydtls = env.StaticLibrary('libtinydtls', env.get('TINYDTLS_SRC'), OBJPREFI
 # IOT-395
 ######################################################################
 if not env.get('RELEASE'):
-	samples_env = env.Clone()
+	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'])
@@ -93,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', 'bcrypt'])
+
 	Alias("samples", [dtlsserver, dtlsclient])
+
 	samples_env.AppendTarget('samples')
 
-env.InstallTarget(libtinydtls, 'libtinydtls');
-env.UserInstallTargetLib(libtinydtls, 'libtinydtls');
+dtls_env.InstallTarget(libtinydtls, 'tinydtls');