diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d2ac2d..bec7808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(imgui) add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1") include_directories(generator/generated) -set(IMGUI_SOURCES ./generator/generated/cimgui_auto.cpp ./imgui/imgui.cpp ./imgui/imgui_draw.cpp ./imgui/imgui_demo.cpp) +set(IMGUI_SOURCES ./generator/generated/cimgui_auto.cpp ./imgui/imgui.cpp ./imgui/imgui_draw.cpp ./imgui/imgui_demo.cpp ./imgui/imgui_widgets.cpp) set(IMGUI_LIBRARIES ) diff --git a/Makefile b/Makefile index b33dfac..1567b1b 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ OBJS = cimgui_auto.o OBJS += ./imgui/imgui.o OBJS += ./imgui/imgui_draw.o OBJS += ./imgui/imgui_demo.o +OBJS += ./imgui/imgui_widgets.o UNAME_S := $(shell uname -s) diff --git a/README.md b/README.md index bb13147..e4b2b1f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Generated files are: cimgui.cpp, cimgui.h for C compilation. Also for helping in This library is intended as a intermediate layer to be able to use imgui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui)) Notes: -* currently this wrapper is based on version [1.63 of imgui] +* currently this wrapper is based on version [1.64 of imgui] * overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/sonoro1234/cimgui/blob/Branch_v1.62.0/generator/generator.lua#L40). Until the comunity finish with defining this table tag will be 1.62beta. Current overloaded function names can be found in (https://github.com/sonoro1234/cimgui/tree/Branch_v1.62.0/generator/generated/overloads.txt) # compilation diff --git a/generator/generated/cimgui.h b/generator/generated/cimgui.h index 2cf8da9..dcaca7a 100644 --- a/generator/generated/cimgui.h +++ b/generator/generated/cimgui.h @@ -38,7 +38,7 @@ typedef unsigned long long ImU64; #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS typedef unsigned short ImDrawIdx; typedef void* ImTextureID; -// dear imgui, v1.63 +// dear imgui, v1.64 typedef struct CustomRect CustomRect; typedef struct GlyphRangesBuilder GlyphRangesBuilder; typedef struct ImFontGlyph ImFontGlyph; diff --git a/imgui b/imgui index 1c4008a..767649a 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit 1c4008aa9735c085f2349e8284e745a686d3896b +Subproject commit 767649afb162dd1dba3b68a132d7401b9a4316f7