diff --git a/external/imgui/CMakeLists.txt b/external/imgui/CMakeLists.txt index 4a4c5ae..b2476b6 100644 --- a/external/imgui/CMakeLists.txt +++ b/external/imgui/CMakeLists.txt @@ -2,43 +2,31 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) project(imgui C CXX) -set(CPP_FILES +add_library(imgui + "imgui/imgui.h" "imgui/imgui.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" "imgui/imgui_tables.cpp" "imgui/imgui_demo.cpp" - "imgui/misc/cpp/imgui_stdlib.cpp" - - "imgui_plot_var.cpp" - - #"imgui_impl_sdl_gl3.cpp" # very old - #"imgui_impl_sdl.cpp" # old - #"imgui_impl_opengl3.cpp" # old - "imgui/backends/imgui_impl_sdl.cpp" - "imgui/backends/imgui_impl_opengl3.cpp" -) - -set(HPP_FILES - "imgui/imgui.h" "imgui/imstb_rectpack.h" "imgui/imstb_textedit.h" "imgui/imstb_truetype.h" "imgui/misc/cpp/imgui_stdlib.h" + "imgui/misc/cpp/imgui_stdlib.cpp" "imgui_plot_var.hpp" + "imgui_plot_var.cpp" - #"imgui_impl_sdl_gl3.h" # very old - #"imgui_impl_sdl.h" # old - #"imgui_impl_opengl3.h" # old - "imgui/backends/imgui_impl_sdl.h" + # TODO: seperate backends into libs + "imgui/backends/imgui_impl_sdl2.h" + "imgui/backends/imgui_impl_sdl2.cpp" "imgui/backends/imgui_impl_opengl3.h" + "imgui/backends/imgui_impl_opengl3.cpp" ) -add_library(imgui ${CPP_FILES} ${HPP_FILES}) - target_compile_features(imgui PUBLIC cxx_std_11) if(MM_OPENGL_3_GLES) diff --git a/external/imgui/imgui b/external/imgui/imgui index 9aae45e..458a109 160000 --- a/external/imgui/imgui +++ b/external/imgui/imgui @@ -1 +1 @@ -Subproject commit 9aae45eb4a05a5a1f96be1ef37eb503a12ceb889 +Subproject commit 458a1090314a965dd37b02c918d83077a0142ad5 diff --git a/framework/imgui/src/mm/services/imgui_s.cpp b/framework/imgui/src/mm/services/imgui_s.cpp index d74fb00..281a590 100644 --- a/framework/imgui/src/mm/services/imgui_s.cpp +++ b/framework/imgui/src/mm/services/imgui_s.cpp @@ -1,7 +1,7 @@ #include "./imgui_s.hpp" #include -#include +#include #ifdef MM_OPENGL_3 #include