MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2024-12-04 19:23:28 +01:00
Code Issues Projects Releases Wiki Activity

update imgui to v1.89.3

Browse Source
This commit is contained in:
Green Sky 2023-03-04 23:47:18 +01:00
parent f655da82d5
commit 196ea7b93b
No known key found for this signature in database
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
external/imgui/CMakeLists.txt vendored
View File

@ -2,43 +2,31 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(imgui C CXX) project(imgui C CXX)
set(CPP_FILES add_library(imgui
"imgui/imgui.h"
"imgui/imgui.cpp" "imgui/imgui.cpp"
"imgui/imgui_draw.cpp" "imgui/imgui_draw.cpp"
"imgui/imgui_widgets.cpp" "imgui/imgui_widgets.cpp"
"imgui/imgui_tables.cpp" "imgui/imgui_tables.cpp"
"imgui/imgui_demo.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_rectpack.h"
"imgui/imstb_textedit.h" "imgui/imstb_textedit.h"
"imgui/imstb_truetype.h" "imgui/imstb_truetype.h"
"imgui/misc/cpp/imgui_stdlib.h" "imgui/misc/cpp/imgui_stdlib.h"
"imgui/misc/cpp/imgui_stdlib.cpp"
"imgui_plot_var.hpp" "imgui_plot_var.hpp"
"imgui_plot_var.cpp"
#"imgui_impl_sdl_gl3.h" # very old # TODO: seperate backends into libs
#"imgui_impl_sdl.h" # old "imgui/backends/imgui_impl_sdl2.h"
#"imgui_impl_opengl3.h" # old "imgui/backends/imgui_impl_sdl2.cpp"
"imgui/backends/imgui_impl_sdl.h"
"imgui/backends/imgui_impl_opengl3.h" "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) target_compile_features(imgui PUBLIC cxx_std_11)
if(MM_OPENGL_3_GLES) if(MM_OPENGL_3_GLES)

2
external/imgui/imgui vendored

@ -1 +1 @@
Subproject commit 9aae45eb4a05a5a1f96be1ef37eb503a12ceb889 Subproject commit 458a1090314a965dd37b02c918d83077a0142ad5

2
framework/imgui/src/mm/services/imgui_s.cpp
View File

@ -1,7 +1,7 @@
#include "./imgui_s.hpp" #include "./imgui_s.hpp"
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include <imgui/backends/imgui_impl_sdl.h> #include <imgui/backends/imgui_impl_sdl2.h>
#ifdef MM_OPENGL_3 #ifdef MM_OPENGL_3
#include <imgui/backends/imgui_impl_opengl3.h> #include <imgui/backends/imgui_impl_opengl3.h>