Merge pull request #42668 from bruvzg/msvc_utf_8

[Windows, MSVC] Correctly set source file encoding.
This commit is contained in:
Rémi Verschelde 2020-10-09 14:18:53 +02:00 committed by GitHub
commit 21ed557ab9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -81,7 +81,7 @@ def configure(env):
vc_base_path = os.environ["VCTOOLSINSTALLDIR"] if "VCTOOLSINSTALLDIR" in os.environ else os.environ["VCINSTALLDIR"]
# Force to use Unicode encoding
env.Append(MSVC_FLAGS=["/utf-8"])
env.AppendUnique(CCFLAGS=["/utf-8"])
# ANGLE
angle_root = os.getenv("ANGLE_SRC_PATH")

View file

@ -223,7 +223,7 @@ def configure_msvc(env, manual_msvc_config):
env.AppendUnique(CCFLAGS=["/MT", "/Gd", "/GR", "/nologo"])
# Force to use Unicode encoding
env.Append(MSVC_FLAGS=["/utf-8"])
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: