From 9a62697e8d50aae80536b6c4dbe6cef67062a71d Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Wed, 23 Mar 2022 18:22:46 +0100 Subject: [PATCH] links correctly now. --- .gitmodules | 2 +- cabal.project | 3 +++ dear-imgui.hs | 2 +- dear-implot.cabal | 25 ++++++++++++++++++++++++- imgui | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 752edc3..2898f37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ branch = v0.13 [submodule "dear-imgui.hs"] path = dear-imgui.hs - url = https://github.com/haskell-game/dear-imgui.hs + url = https://github.com/drezil/dear-imgui.hs diff --git a/cabal.project b/cabal.project index c660f08..f1943a1 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,6 @@ packages: *.cabal + dear-imgui.hs package dear-implot ghc-options: -Wall -Wcompat -fno-warn-unused-do-bind + +shared: true diff --git a/dear-imgui.hs b/dear-imgui.hs index e5969f6..51a634c 160000 --- a/dear-imgui.hs +++ b/dear-imgui.hs @@ -1 +1 @@ -Subproject commit e5969f6b358dab01d9e2bea8d3538fdfbee0c2f1 +Subproject commit 51a634c7818d120ec43d4d4ee4392adc1d224128 diff --git a/dear-implot.cabal b/dear-implot.cabal index d2ea253..8f98cee 100644 --- a/dear-implot.cabal +++ b/dear-implot.cabal @@ -2,6 +2,21 @@ cabal-version: 3.0 name: dear-implot version: 1.0.0 build-type: Simple +extra-source-files: + README.md, + CONTRIBUTING.md, + implot/*.h, + implot/LICENSE, + dear-imgui.hs/imgui/*.h, + dear-imgui.hs/imgui/LICENSE.txt + +flag use-wchar32 + description: + Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...) + default: + True + manual: + True library exposed-modules: @@ -27,20 +42,28 @@ library Haskell2010 ghc-options: -Wall + install-includes: + implot/implot.h + implot/implot_internal.h cxx-sources: implot/implot.cpp + implot/implot_demo.cpp implot/implot_items.cpp cxx-options: -std=c++11 extra-libraries: stdc++ + --HSdear-imgui-1.4.0-inplace include-dirs: implot dear-imgui.hs/imgui + if flag(use-wchar32) + cxx-options: -DIMGUI_USE_WCHAR32 + cpp-options: -DIMGUI_USE_WCHAR32 build-depends: base , StateVar , containers - , dear-imgui >= 1.4.0 + , dear-imgui == 1.4.0 , inline-c , inline-c-cpp , managed diff --git a/imgui b/imgui index 378f854..f247d2b 120000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -dear-imgui.hs/imgui/ \ No newline at end of file +dear-imgui.hs/imgui \ No newline at end of file