Skip to content

Commit cff9e56

Browse files
committed
refactor sharedLib
1 parent acf7cd4 commit cff9e56

File tree

2 files changed

+35
-57
lines changed

2 files changed

+35
-57
lines changed

Setup.hs

Lines changed: 0 additions & 14 deletions
This file was deleted.

dear-imgui.cabal

Lines changed: 35 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ description:
1313
Set package flags according to your needs.
1414

1515
build-type: Simple
16-
extra-source-files:
17-
README.md,
18-
ChangeLog.md
1916

2017
extra-source-files:
18+
README.md,
19+
ChangeLog.md,
2120
imgui/*.h,
2221
imgui/backends/*.h,
2322
imgui/backends/*.mm,
@@ -137,6 +136,7 @@ library
137136
import: common
138137
hs-source-dirs:
139138
src
139+
generator
140140
exposed-modules:
141141
DearImGui
142142
DearImGui.FontAtlas
@@ -152,6 +152,13 @@ library
152152
DearImGui.Context
153153
DearImGui.Enums
154154
DearImGui.Structs
155+
DearImGui.Generator
156+
DearImGui.Generator.Parser
157+
DearImGui.Generator.Tokeniser
158+
DearImGui.Generator.Types
159+
ghc-options:
160+
-static -dynamic-too
161+
-- create both libHSdear-imgui... .a and .so
155162
cxx-options: -std=c++11
156163
cxx-sources:
157164
imgui/imgui.cpp
@@ -167,20 +174,39 @@ library
167174
imstb_truetype.h
168175
extra-libraries:
169176
stdc++
170-
extra-bundled-libraries:
171-
HSdear-imgui-2.0.0-inplace
172177
include-dirs:
173178
imgui
174179
build-depends:
175-
dear-imgui-generator
176-
, containers
177-
, managed
178-
, inline-c
180+
managed
179181
, inline-c-cpp
180182
, StateVar
181183
, unliftio
182184
, vector
185+
-- for the generator:
186+
, template-haskell
187+
>= 2.15 && < 2.19
188+
, containers
189+
^>= 0.6.2.1
190+
, directory
191+
>= 1.3 && < 1.4
192+
, filepath
193+
>= 1.4 && < 1.5
194+
, inline-c
195+
>= 0.9.0.0 && < 0.10
196+
, megaparsec
197+
>= 9.0 && < 9.3
198+
, parser-combinators
199+
>= 1.2.0 && < 1.4
200+
, scientific
201+
>= 0.3.6.2 && < 0.3.8
183202
, text
203+
>= 1.2.4 && < 2.1
204+
, th-lift
205+
>= 0.7 && < 0.9
206+
, transformers
207+
>= 0.5.6 && < 0.6
208+
, unordered-containers
209+
>= 0.2.11 && < 0.3
184210

185211
if flag(disable-obsolete)
186212
cxx-options: -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -270,40 +296,6 @@ library
270296
exposed-modules:
271297
DearImGui.GLFW.Vulkan
272298

273-
library dear-imgui-generator
274-
import: common
275-
hs-source-dirs: generator
276-
exposed-modules:
277-
DearImGui.Generator
278-
, DearImGui.Generator.Parser
279-
, DearImGui.Generator.Tokeniser
280-
, DearImGui.Generator.Types
281-
build-depends:
282-
template-haskell
283-
>= 2.15 && < 2.19
284-
, containers
285-
^>= 0.6.2.1
286-
, directory
287-
>= 1.3 && < 1.4
288-
, filepath
289-
>= 1.4 && < 1.5
290-
, inline-c
291-
>= 0.9.0.0 && < 0.10
292-
, megaparsec
293-
>= 9.0 && < 9.3
294-
, parser-combinators
295-
>= 1.2.0 && < 1.4
296-
, scientific
297-
>= 0.3.6.2 && < 0.3.8
298-
, text
299-
>= 1.2.4 && < 2.1
300-
, th-lift
301-
>= 0.7 && < 0.9
302-
, transformers
303-
>= 0.5.6 && < 0.6
304-
, unordered-containers
305-
>= 0.2.11 && < 0.3
306-
307299
executable test
308300
import: common, exe-flags
309301
main-is: Main.hs

0 commit comments

Comments
 (0)