Merge pull request #1 from KinoxKlark/main

hinxx · web-flow · commit 735cec024f56 · 2021-03-25T13:27:58.000+01:00
fix compilation and linking with pyimgui
diff --git a/implot/core.pxd b/implot/core.pxd
diff --git a/implot/plot.pyx b/implot/plot.pyx
@@ -13,7 +13,7 @@ from libc.stdlib cimport malloc, free
 
 cimport cimplot
 cimport cimgui
-cimport core
+cimport imgui.core as core
 cimport enums
 from imgui import core
 
diff --git a/setup.py b/setup.py
@@ -149,7 +149,7 @@ def backend_extras(*requirements):
         # 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', 'imgui-cpp', 'implot-cpp'],
+        include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],
     ),
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ def backend_extras(*requirements):`
`149`	`149`	`# include_dirs=['imgui', 'implot-cpp'],`
`150`	`150`	`# include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'ansifeed-cpp', 'implot-cpp'],`
`151`	`151`	`# include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],`
`152`		`- include_dirs=['implot', 'imgui-cpp', 'implot-cpp'],`
	`152`	`+ include_dirs=['implot', 'config-cpp', 'imgui-cpp', 'implot-cpp'],`
`153`	`153`	`),`
`154`	`154`	`]`
`155`	`155`