IOT-1583: Removing /W4 warning from resource/c_common.

[platform/upstream/iotivity.git] / resource / c_common / windows / SConscript

diff --git a/resource/c_common/windows/SConscript b/resource/c_common/windows/SConscript
index 9ec7027..30ccbf2 100644 (file)
--- a/resource/c_common/windows/SConscript
+++ b/resource/c_common/windows/SConscript
@@ -1,11 +1,13 @@
 ##
 # Builds Windows-specific helper library
 ##
-Import('env')
+Import('env common_env')
 import os.path
 
 # Include any headers that might be missing on Windows
-env.AppendUnique(CPPPATH = [os.path.abspath('./include')])
+header = os.path.abspath('./include')
+env.AppendUnique(CPPPATH = [header])
+common_env.AppendUnique(CPPPATH = [header])
 
 ######################################################################
 # Source files and Targets
@@ -18,7 +20,7 @@ helper_src = [
        os.path.join(src_dir, 'pthread_create.c')
        ]
 
-win_helper_env = env.Clone()
+win_helper_env = common_env.Clone()
 
 win_helper_env.AppendUnique(CPPPATH = ['#resource/csdk/logger/include'])
 static_libwinhelper = win_helper_env.StaticLibrary('win_helper', helper_src)
@@ -29,5 +31,6 @@ win_helper_env.UserInstallTargetHeader('include/win_sleep.h', 'c_common/windows/
 win_helper_env.UserInstallTargetHeader('include/pthread_create.h', 'c_common/windows/include', 'pthread_create.h')
 win_helper_env.UserInstallTargetHeader('include/vs12_snprintf.h', 'c_common/windows/include', 'vs12_snprintf.h')
 
-env.AppendUnique(LIBS = ['win_helper', 'bcrypt'])
-
+helper_lib = ['win_helper']
+env.AppendUnique(LIBS = helper_lib)
+common_env.AppendUnique(LIBS = helper_lib)