[Win32] Modify SConscripts to prepare for VS

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / SConscript

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index f04ebd5..1cf0fdb 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -46,17 +46,11 @@ env.SConscript(os.path.join(root_dir, 'util', 'SConscript'))
 # The tinydtls library is found in '#extlibs/tinydtls', where the '#'
 # is interpreted by SCons as the top-level iotivity directory where
 # the SConscruct file is found.
+build_dir = env.get('BUILD_DIR')
 if env.get('SECURED') == '1':
-       if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'):
-               env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
-       else:
-               env.SConscript('#extlibs/tinydtls/SConscript')
-       if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/timer'):
-               env.SConscript(os.path.join(root_dir, 'extlibs/timer/SConscript'))
-               env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/timer')])
-       else:
-               env.SConscript('#extlibs/timer/SConscript')
-               env.AppendUnique(CPPPATH = ['#extlibs/timer'])
+       env.SConscript(build_dir + 'extlibs/tinydtls/SConscript')
+       env.SConscript(build_dir + 'extlibs/timer/SConscript')
+       env.AppendUnique(CPPPATH = ['#extlibs/timer'])
 
 env.AppendUnique(CA_SRC = [os.path.join(ca_path,
                                         'adapter_util/caadapterutils.c')])
@@ -174,7 +168,7 @@ if ca_os in ['android', 'tizen']:
        if ca_os != 'android':
                lib_env.AppendUnique(LIBS = ['rt'])
        calib = lib_env.SharedLibrary('connectivity_abstraction', env.get('CA_SRC'))
-elif ca_os in ['msys_nt']:
+elif ca_os in ['msys_nt', 'windows']:
        lib_env.AppendUnique(LIBS = ['coap', 'mswsock', 'ws2_32', 'iphlpapi', 'logger'])
        if lib_env.get('SECURED') == '1':
                lib_env.AppendUnique(LIBS = ['tinydtls'])
@@ -182,5 +176,5 @@ elif ca_os in ['msys_nt']:
        calib = lib_env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
 else:
        calib = lib_env.StaticLibrary('connectivity_abstraction', lib_env.get('CA_SRC'))
-lib_env.InstallTarget(calib, 'libconnectivity_abstraction')
-lib_env.UserInstallTargetLib(calib, 'libconnectivity_abstraction')
+lib_env.InstallTarget(calib, 'connectivity_abstraction')
+lib_env.UserInstallTargetLib(calib, 'connectivity_abstraction')