From 7b694ebeb467b8c994f01c7f39565a1978de4ef6 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Sat, 5 Dec 2020 12:55:00 +0100
Subject: [PATCH] Set default to utf-8 for MSVC

---
 .editorconfig       | 2 +-
 CMakeLists.txt      | 2 +-
 rpcs3_default.props | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e2d719bf10..479fa0b13e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,7 @@
 root = true
 
 [*.{h,cpp,hpp}]
-charset = utf-8-bom
+charset = utf-8
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c553c235f..b89653f52d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ set(CMAKE_C_FLAGS -w)
 set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "")
 
 if(MSVC)
-	add_compile_options(/wd4530) # C++ exception handler used, but unwind semantics are not enabled
+	add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
 endif()
 
 add_subdirectory(Vulkan EXCLUDE_FROM_ALL)
diff --git a/rpcs3_default.props b/rpcs3_default.props
index a51f2711b3..508dde700b 100644
--- a/rpcs3_default.props
+++ b/rpcs3_default.props
@@ -20,7 +20,7 @@
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalOptions>/Zc:throwingNew /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 /Zc:throwingNew /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>xxhash.lib;ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>