From 262c93dd25c448bc605cb65378329533c9cbe0ef Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 29 Aug 2023 08:54:17 +1000
Subject: Bug [#2400]. Fix building with non-English environment.

---
 doc/ScintillaHistory.html | 5 +++++
 win32/Scintilla.vcxproj   | 1 +
 win32/scintilla.mak       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 72a02b7a4..069a2cf5c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -579,6 +579,7 @@
       </tr><tr>
 	<td>Chengzhi Li</td>
 	<td>Gary James</td>
+	<td>Tsuyoshi Miyake</td>
     </tr>
     </table>
     <h2>Releases</h2>
@@ -600,6 +601,10 @@
 	<li>
 	For Qt, fix potential crash when using IME with large amount of text selected.
 	</li>
+	<li>
+	For Windows, fix building with non-English environment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2400/">Bug #2400</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla536.zip">Release 5.3.6</a>
diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index 9976fd72f..4e4024234 100644
--- a/win32/Scintilla.vcxproj
+++ b/win32/Scintilla.vcxproj
@@ -90,6 +90,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 7e510aeaf..cc18f26a7 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -36,7 +36,7 @@ SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
 !ENDIF
 
 CRTFLAGS=$(ADD_DEFINE)
-CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS)
+CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 -utf-8 $(CRTFLAGS)
 CXXDEBUG=-Od -MTd -DDEBUG
 CXXNDEBUG=-O2 -MT -DNDEBUG -GL
 NAME=-Fo
-- 
cgit v1.2.3