Merge branch 'dev'

netwarm007 · Jul 3, 2022 · 3ef737b · 3ef737b
2 parents f0d85ee + 3b64620
commit 3ef737b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ ELSEIF(WIN32)
 ENDIF(UNIX)
 
 if(MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CRT_SECURE_NO_WARNINGS /MP")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CRT_SECURE_NO_WARNINGS /MP /utf-8")
 endif(MSVC)
 
 if(ANDROID)

diff --git a/Test/ImGuiTest.cpp b/Test/ImGuiTest.cpp
@@ -44,8 +44,8 @@ int test(BaseApplication& app) {
     ImVector<ImWchar> ranges;
     ImFontGlyphRangesBuilder builder;
     builder.AddText(
-        (const char*)u8"屏擎渲帧钮");  // Add a string (here "Hello world"
-                                       // contains 7 unique characters)
+        (const char*)u8"屏擎渲帧钮");
+
     builder.AddRanges(
         io.Fonts->GetGlyphRangesChineseSimplifiedCommon());  // Add one of the
                                                              // default ranges