replace fips-imgui-dock with dcimgui

floooh · Dec 6, 2024 · 955bdfd · 955bdfd
1 parent 21c1814
commit 955bdfd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,6 @@ if (NOT USE_SOKOL_APP AND NOT SOKOL_USE_WGPU_DAWN AND NOT SOKOL_USE_D3D11 AND NO
     fips_import_fips_glfw_glfw3()
 endif()
 fips_import_dcimgui_dcimgui()
-fips_import_fips_imgui_dock_imgui_dock()
 if (NOT FIPS_UWP)
     fips_import_fips_libmodplug_libmodplug()
 endif()

diff --git a/fips.yml b/fips.yml
@@ -11,8 +11,6 @@ imports:
     git: https://github.com/floooh/sokol-tools-bin
   fips-glfw:
     git: https://github.com/fips-libs/fips-glfw
-  fips-imgui-dock:
-    git: https://github.com/fips-libs/fips-imgui-dock.git
   fips-libmodplug:
     git: https://github.com/fips-libs/fips-libmodplug
   fips-utils:

diff --git a/sapp/CMakeLists.txt b/sapp/CMakeLists.txt
@@ -425,7 +425,7 @@ fips_ide_group(Samples)
 fips_begin_app(imgui-dock-sapp windowed)
     fips_files(imgui-dock-sapp.cc)
     # use sokol-cpp for testing here, this isn't required though
-    fips_deps(sokol-cpp imgui-dock)
+    fips_deps(sokol-cpp imgui-docking)
     if (FIPS_IOS)
         fips_files(ios-info.plist)
     endif()

diff --git a/sapp/imgui-dock-sapp.cc b/sapp/imgui-dock-sapp.cc
@@ -7,7 +7,7 @@
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "sokol_glue.h"
-#include "imgui-dock/imgui.h"
+#include "imgui.h"
 #define SOKOL_IMGUI_IMPL
 #include "sokol_imgui.h"