use pyimgui imgui-cpp so and h

Author: hinxx

.gitignore

@@ -19,6 +19,7 @@ implot/*.cpp
 implot/*.h
 implot/*.c
 shlib/*.o
+implot/implotcpp/
 
 # Distribution / packaging
 .Python

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "imgui-cpp"]
-	path = imgui-cpp
-	url = https://github.com/ocornut/imgui.git
-
 [submodule "implot-cpp"]
 	path = implot-cpp
 	url = https://github.com/epezent/implot.git

Makefile

@@ -29,7 +29,10 @@ clean:
 .PHONY: solib
 solib: bootstrap
 	make -C shlib
-	cp shlib/libimplot.so implot/
+	if ! test -d implot/implotcpp; then mkdir implot/implotcpp; fi
+	cp shlib/libimplot.so implot/implotcpp
+	cp implot-cpp/implot.h implot/implotcpp
+	cp implot-cpp/implot_internal.h implot/implotcpp
 
 
 .PHONY: build

imgui-cpp

@@ -155,16 +155,17 @@ def imgui_location():
         "implot.plot", extension_sources("implot/plot"),
         extra_compile_args=os_specific_flags,
         # XXX: handle Windows/MacOS
-        extra_link_args=["-Wl,-rpath,$ORIGIN"],
+        extra_link_args=["-Wl,-rpath,$ORIGIN/implotcpp"],
         define_macros=[
             # note: for raising custom exceptions directly in ImGui code
             ('PYIMGUI_CUSTOM_EXCEPTION', None)
         ] + os_specific_macros + general_macros,
         # include_dirs=['imgui', 'implot-cpp'],
         # include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'ansifeed-cpp', 'implot-cpp'],
         # include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],
-        include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],
-        library_dirs=["implot", imgui_location()],
+        # include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],
+        include_dirs=['implot', 'config-cpp', imgui_location()+'/imguicpp', 'implot-cpp'],
+        library_dirs=["implot/implotcpp", imgui_location()+'/imguicpp'],
         # order matters; libimplot needs to preceede libimgui!
         libraries=["implot", "imgui"],
     ),

implot-cpp

@@ -1,7 +1,10 @@
 # Compile sources into shared library. Tested on Linux.
 
+
 EXE = libimplot.so
-IMGUI_DIR = ../imgui-cpp
+#IMGUI_DIR = ../imgui-cpp
+IMGUI_DIR := $(shell python -c "import os, pkg_resources; print(os.path.dirname(pkg_resources.resource_filename('imgui', 'imgui.h')))")/imguicpp
+$(warning Using IMGUI_DIR $(IMGUI_DIR))
 IMPLOT_DIR = ../implot-cpp
 SOURCES = $(IMPLOT_DIR)/implot.cpp \
 	$(IMPLOT_DIR)/implot_demo.cpp \