Branimir Karadžić 9 anni fa
parent
commit
b5a160d5f6

+ 1 - 0
3rdparty/ocornut-imgui/imgui.cpp

@@ -620,6 +620,7 @@
 #endif
 
 #ifdef _MSC_VER
+#pragma warning (disable: 4201) // nonstandard extension used: nameless struct/union
 #pragma warning (disable: 4127) // condition expression is constant
 #pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
 #pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen

+ 1 - 0
3rdparty/ocornut-imgui/imgui_user.h

@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <inttypes.h>
 
 namespace ImGui
 {

+ 1 - 1
3rdparty/ocornut-imgui/widgets/file_list.inl

@@ -80,7 +80,7 @@ namespace ImGui
 					}
 					else
 					{
-						Text("%10d", it->Size);
+						Text("%10" PRId64, it->Size);
 					}
 
 					if (clicked)