Merge branch 'master' into blender2.8

2017-12-11 19:24:37 +11:00 · 2017-12-11 19:24:37 +11:00 · 4737b95b65
parent a2f2231014 dd4e0cd3e3
commit 4737b95b65
1 changed files with 5 additions and 0 deletions
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@ -52,6 +52,11 @@ macro(find_package_wrapper)
 endmacro()

 add_definitions(-DWIN32)
+
+# Needed, otherwise system encoding causes utf-8 encoding to fail in some cases (C4819)
+add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+
 # Minimum MSVC Version
 if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 	if(MSVC_VERSION EQUAL 1800)