Fix build error with scons-4.4.0 version which is based on python3

[platform/upstream/iotivity.git] / build_common / windows / SConscript

diff --git a/build_common/windows/SConscript b/build_common/windows/SConscript
index 305487a..1718d67 100644 (file)
--- a/build_common/windows/SConscript
+++ b/build_common/windows/SConscript
@@ -6,32 +6,37 @@ import os.path
 
 # Set common flags
 if env['CC'] == 'cl':
-       # C4244 conversion from one type to another type results in a possible loss of data.
-       # C4267 conversion from size_t to a smaller type.
-       # C4355 'this' used in base member initializer list.
-       # C4800 forcing value to bool 'true' or 'false'.
-       # C4996 deprecated declaration.
-       # C4820 added padding to the end of a struct.
-       # C4514 unreferenced inline function has been removed
-       # C4365 signed/unsigned mismatch
-       # C4503 decorated name length exceeded, name was truncated
-       env.AppendUnique(CXXFLAGS=['/wd4244', '/wd4267', '/wd4355', '/wd4800', '/wd4996', '/wd4820', '/wd4514', '/wd4365', '/wd4503'])
-       env.AppendUnique(CCFLAGS=['/EHsc'])
 
-       # Enable special exports for unit test purposes
-       if env.get('TEST') == '1':
-               env.AppendUnique(CPPDEFINES = ['ENABLE_TEST_EXPORTS'])
-       # Set release/debug flags
-       if env.get('RELEASE'):
-               env.AppendUnique(CCFLAGS = ['/MD', '/O2', '/GF'])
-               env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-       else:
-               env.AppendUnique(CCFLAGS = ['/MDd', '/Od', '/ZI', '/RTC1', '/Gm'])
-               env.AppendUnique(LINKFLAGS = ['/debug'])
-       env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-       env.AppendUnique(PATH = os.environ['PATH'])
+    # TODO: re-enable warnings, especially: 4244, 4267, 4365
+    env.AppendUnique(CXXFLAGS=[
+        '/wd4244',   # C4244 conversion from one type to another type results in a possible loss of data.
+        '/wd4267',   # C4267 conversion from size_t to a smaller type.
+        '/wd4355',   # C4355 'this' used in base member initializer list.
+        '/wd4800',   # C4800 forcing value to bool 'true' or 'false'.
+        '/wd4996',   # C4996 deprecated declaration.
+        '/wd4820',   # C4820 added padding to the end of a struct.
+        '/wd4514',   # C4514 unreferenced inline function has been removed
+        '/wd4365',   # C4365 signed/unsigned mismatch
+        '/wd4503'])  # C4503 decorated name length exceeded, name was truncated
+
+    env.AppendUnique(CCFLAGS=['/EHsc'])
+
+    vs_version = env['MSVC_VERSION']
+
+    # Set release/debug flags
+    if env.get('RELEASE'):
+        env.AppendUnique(CCFLAGS = ['/MD', '/O2', '/GF'])
+        env.AppendUnique(CPPDEFINES = ['NDEBUG'])
+    elif env.get('TARGET_ARCH') in ['x86', 'x86_64'] or "14.0" in vs_version:
+        env.AppendUnique(CCFLAGS = ['/MDd', '/Od', '/ZI', '/RTC1', '/Gm'])
+        env.AppendUnique(LINKFLAGS = ['/debug'])
+    else:
+        env.AppendUnique(CCFLAGS = ['/MDd', '/Od', '/Zi', '/RTC1', '/Gm'])
+        env.AppendUnique(LINKFLAGS = ['/debug'])
+    env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+    env.AppendUnique(PATH = os.environ['PATH'])
 
 elif env['CC'] == 'gcc':
-       print "\nError: gcc not supported on Windows.  Use Visual Studio!\n"
-       Exit(1);
+    print("\nError: gcc not supported on Windows.  Use Visual Studio!\n")
+    Exit(1);