diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-19 08:41:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 08:41:43 +0200 |
| commit | d1c26674eb5827311e6b249f56e1e66b70806bb3 (patch) | |
| tree | 80a8dbf9033f496106ef2a72454f183c213d151e /platform | |
| parent | 4ad255a078da0e9cc2620fe714bd722aae38206f (diff) | |
| parent | bd7aa1b6f6256f3dd94ac249696588a5e0eb2af7 (diff) | |
Merge pull request #28051 from WindyDarian/no_utf8_for_vs2013
Ignore '/utf-8' flag on Visual Studio 2013
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/detect.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 15e8f33eae..2f7334657f 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -195,7 +195,9 @@ def configure_msvc(env, manual_msvc_config): ## 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++ if manual_msvc_config: # should be automatic if SCons found it if os.getenv("WindowsSdkDir") is not None: |