Merge pull request #1175 from bruvzg/msvc_force_utf8

[MSVC] Force UTF-8 encoding.
pull/1184/head
David Snopek 2023-07-14 06:49:42 -05:00 committed by GitHub
commit a9209ce881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -86,7 +86,7 @@ set(GODOT_COMPILE_FLAGS )
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# using Visual Studio C++ # using Visual Studio C++
set(GODOT_COMPILE_FLAGS "/EHsc") # /GF /MP set(GODOT_COMPILE_FLAGS "/EHsc /utf-8") # /GF /MP
if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_BUILD_TYPE MATCHES Debug)
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /MDd") # /Od /RTC1 /Zi set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /MDd") # /Od /RTC1 /Zi

View File

@ -30,7 +30,7 @@ def generate(env):
env.Tool("mslink") env.Tool("mslink")
env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"]) env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"])
env.Append(CCFLAGS=["/EHsc"]) env.Append(CCFLAGS=["/EHsc", "/utf-8"])
env.Append(LINKFLAGS=["/WX"]) env.Append(LINKFLAGS=["/WX"])
if env["use_clang_cl"]: if env["use_clang_cl"]: