From 1e6b97311a879805882e87acbdda900b92fbd177 Mon Sep 17 00:00:00 2001 From: Steven Savold Date: Mon, 30 Nov 2020 18:21:32 -0500 Subject: [PATCH 1/3] Updated premake5.lua to include the files which support the cpp stdlib --- premake5.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/premake5.lua b/premake5.lua index 25c9db993ad5..e965344d6635 100644 --- a/premake5.lua +++ b/premake5.lua @@ -16,7 +16,9 @@ project "ImGui" "imstb_rectpack.h", "imstb_textedit.h", "imstb_truetype.h", - "imgui_demo.cpp" + "imgui_demo.cpp", + "misc/cpp/imgui_stdlib.cpp", + "misc/cpp/imgui_stdlib.h" } filter "system:windows" From 2a4e4eaad14c2a13b040f87cd9ab804a4afd82e7 Mon Sep 17 00:00:00 2001 From: Steven Savold Date: Mon, 30 Nov 2020 18:23:15 -0500 Subject: [PATCH 2/3] Changed spaces to tabs to fit the rest of the file --- premake5.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/premake5.lua b/premake5.lua index e965344d6635..7e2c62a9bb55 100644 --- a/premake5.lua +++ b/premake5.lua @@ -17,8 +17,8 @@ project "ImGui" "imstb_textedit.h", "imstb_truetype.h", "imgui_demo.cpp", - "misc/cpp/imgui_stdlib.cpp", - "misc/cpp/imgui_stdlib.h" + "misc/cpp/imgui_stdlib.cpp", + "misc/cpp/imgui_stdlib.h" } filter "system:windows" From 8d0236dc85147008db035b94056d7ad9be97c2fd Mon Sep 17 00:00:00 2001 From: Steven Savold Date: Mon, 30 Nov 2020 18:33:23 -0500 Subject: [PATCH 3/3] Modified the include for imgui.h inside of imgui_stdlib.cpp --- misc/cpp/imgui_stdlib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/cpp/imgui_stdlib.cpp b/misc/cpp/imgui_stdlib.cpp index cb1fe1743d8e..e2b094eca16b 100644 --- a/misc/cpp/imgui_stdlib.cpp +++ b/misc/cpp/imgui_stdlib.cpp @@ -8,7 +8,7 @@ // Changelog: // - v0.10: Initial version. Added InputText() / InputTextMultiline() calls with std::string -#include "imgui.h" +#include "../../imgui.h" #include "imgui_stdlib.h" struct InputTextCallback_UserData