Merge pull request #9 from JuliaImGui/update

Bump for v1.91.6
JuliaImGui · Dec 19, 2024 · 98a11d0 · 98a11d0
2 parents bf7194e + 070ac5e
commit 98a11d0
Show file tree

Hide file tree

Showing 9 changed files with 1,681 additions and 1,644 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ related packages:
 
 The versions have been picked so that they're all compatible with each other,
 i.e. matching the latest ImGui version. The currently supported ImGui version
-is: [*v1.91.2*](https://github.com/ocornut/imgui/releases/tag/v1.91.2).
+is: [*v1.91.6*](https://github.com/ocornut/imgui/releases/tag/v1.91.6).
 
 You can build the resulting shared library locally with:
 ```julia-repl

diff --git a/build.jl b/build.jl
@@ -21,10 +21,6 @@ cd(joinpath(@__DIR__, "cimgui/generator")) do
     for json_file in filter(endswith(".json"), readdir("output"; join=true))
         cp(json_file, joinpath(output_dir, basename(json_file)); force=true)
     end
-
-    # Hack: cimgui.h is badly modified with comments turned on, so we reset it
-    # back to HEAD. See: https://github.com/cimgui/cimgui/issues/282
-    run(`git restore ../cimgui.h`)
 end
 
 # Generate the imgui_test_engine wrappers

diff --git a/cimgui b/cimgui
+1 −1		README.md
+9 −5		cimgui.cpp
+21 −17		cimgui.h
+3 −1		generator/generator.lua
+1,403 −1,378		generator/output/definitions.json
+1,398 −1,377		generator/output/definitions.lua
+12 −12		generator/output/impl_definitions.json
+12 −12		generator/output/impl_definitions.lua
+227 −217		generator/output/structs_and_enums.json
+252 −244		generator/output/structs_and_enums.lua
+1 −1		imgui