Browse Source

Merge pull request #28051 from WindyDarian/no_utf8_for_vs2013

Ignore '/utf-8' flag on Visual Studio 2013
Rémi Verschelde 6 years ago
parent
commit
d1c26674eb
1 changed files with 3 additions and 1 deletions
  1. 3 1
      platform/windows/detect.py

+ 3 - 1
platform/windows/detect.py

@@ -195,7 +195,9 @@ def configure_msvc(env, manual_msvc_config):
 
 
     ## Compile/link flags
     ## Compile/link flags
 
 
-    env.AppendUnique(CCFLAGS=['/MT', '/Gd', '/GR', '/nologo', '/utf-8'])
+    env.AppendUnique(CCFLAGS=['/MT', '/Gd', '/GR', '/nologo'])
+    if int(env['MSVC_VERSION'].split('.')[0]) >= 14: #vs2015 and later
+        env.AppendUnique(CCFLAGS=['/utf-8'])
     env.AppendUnique(CXXFLAGS=['/TP']) # assume all sources are C++
     env.AppendUnique(CXXFLAGS=['/TP']) # assume all sources are C++
     if manual_msvc_config: # should be automatic if SCons found it
     if manual_msvc_config: # should be automatic if SCons found it
         if os.getenv("WindowsSdkDir") is not None:
         if os.getenv("WindowsSdkDir") is not None: