From 56f3aba7b2c1c74556cfc1dd8f9b24af71c33b16 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 9 Oct 2020 13:56:20 +0300
Subject: [PATCH] [Windows, MSVC] Correctly set source file encoding.

---
 platform/uwp/detect.py     | 2 +-
 platform/windows/detect.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py
index 6e57dbbf649..2af7803749c 100644
--- a/platform/uwp/detect.py
+++ b/platform/uwp/detect.py
@@ -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")
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index d5474ace9cf..489e45404f8 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -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: