refactor sharedLib

This commit is contained in:
Nicole Dresselhaus 2022-07-21 23:23:46 +02:00 committed by Drezil
parent 3b37a21470
commit 7828ddb111
3 changed files with 37 additions and 57 deletions

View File

@ -1,14 +0,0 @@
import Distribution.Simple
main :: IO ()
main = defaultMainWithHooks simpleUserHooks
{ postCopy = copyLib
}
copyLib :: :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
copyExtLib _ flags pkg_descr lbi = do
let libPref = libdir . absoluteInstallDirs pkg_descr lbi
. fromFlag . copyDest
$ flags
let verbosity = fromFlag $ copyVerbosity flags
rawSystemExit verbosity "cp" ["libHSdear-imgui-2.0.0-inplace-ghc8.10.7.so", libPref]

View File

@ -13,11 +13,10 @@ description:
Set package flags according to your needs. Set package flags according to your needs.
build-type: Simple build-type: Simple
extra-source-files:
README.md,
ChangeLog.md
extra-source-files: extra-source-files:
README.md,
ChangeLog.md,
imgui/*.h, imgui/*.h,
imgui/backends/*.h, imgui/backends/*.h,
imgui/backends/*.mm, imgui/backends/*.mm,
@ -157,6 +156,7 @@ library
import: common import: common
hs-source-dirs: hs-source-dirs:
src src
generator
exposed-modules: exposed-modules:
DearImGui DearImGui
DearImGui.FontAtlas DearImGui.FontAtlas
@ -172,6 +172,13 @@ library
other-modules: other-modules:
DearImGui.Enums DearImGui.Enums
DearImGui.Structs DearImGui.Structs
DearImGui.Generator
DearImGui.Generator.Parser
DearImGui.Generator.Tokeniser
DearImGui.Generator.Types
ghc-options:
-static -dynamic-too
-- create both libHSdear-imgui... .a and .so
cxx-options: -std=c++11 cxx-options: -std=c++11
cxx-sources: cxx-sources:
imgui/imgui.cpp imgui/imgui.cpp
@ -189,20 +196,41 @@ library
build-depends: system-cxx-std-lib build-depends: system-cxx-std-lib
else else
extra-libraries: stdc++ extra-libraries: stdc++
extra-bundled-libraries:
HSdear-imgui-2.0.0-inplace
include-dirs: include-dirs:
imgui imgui
build-depends: build-depends:
dear-imgui-generator containers
, containers
, managed , managed
, inline-c , inline-c
, inline-c-cpp , inline-c-cpp
, StateVar , StateVar
, unliftio , unliftio
, vector , vector
-- for the generator:
, template-haskell
>= 2.15 && < 2.19
, containers
^>= 0.6.2.1
, directory
>= 1.3 && < 1.4
, filepath
>= 1.4 && < 1.5
, inline-c
>= 0.9.0.0 && < 0.10
, megaparsec
>= 9.0 && < 9.3
, parser-combinators
>= 1.2.0 && < 1.4
, scientific
>= 0.3.6.2 && < 0.3.8
, text , text
>= 1.2.4 && < 2.1
, th-lift
>= 0.7 && < 0.9
, transformers
>= 0.5.6 && < 0.6
, unordered-containers
>= 0.2.11 && < 0.3
if os(darwin) if os(darwin)
ghc-options: ghc-options:
@ -306,40 +334,6 @@ library
exposed-modules: exposed-modules:
DearImGui.GLFW.Vulkan DearImGui.GLFW.Vulkan
library dear-imgui-generator
import: common
hs-source-dirs: generator
exposed-modules:
DearImGui.Generator
, DearImGui.Generator.Parser
, DearImGui.Generator.Tokeniser
, DearImGui.Generator.Types
build-depends:
template-haskell
>= 2.15 && < 2.21
, containers
^>= 0.6.2.1
, directory
>= 1.3 && < 1.4
, filepath
>= 1.4 && < 1.5
, inline-c
>= 0.9.0.0 && < 0.10
, megaparsec
>= 9.0 && < 9.4
, parser-combinators
>= 1.2.0 && < 1.4
, scientific
>= 0.3.6.2 && < 0.3.8
, text
>= 1.2.4 && < 2.1
, th-lift
>= 0.7 && < 0.9
, transformers
>= 0.5.6 && < 0.7
, unordered-containers
>= 0.2.11 && < 0.3
executable test executable test
import: common, exe-flags import: common, exe-flags
main-is: Main.hs main-is: Main.hs
@ -354,7 +348,7 @@ executable glfw
main-is: Main.hs main-is: Main.hs
hs-source-dirs: examples/glfw hs-source-dirs: examples/glfw
default-language: Haskell2010 default-language: Haskell2010
if (!flag(examples) || !flag(glfw) || !flag(opengl2)) if (!flag(examples) || !flag(glfw) || !(flag(opengl3) || flag(opengl2)))
buildable: False buildable: False
else else
build-depends: base, GLFW-b, gl, dear-imgui, managed, text build-depends: base, GLFW-b, gl, dear-imgui, managed, text

2
imgui

@ -1 +1 @@
Subproject commit c6e0284ac58b3f205c95365478888f7b53b077e2 Subproject commit 736b1a4b1b8563fc1dd5e1415411f8c8266e9ed6