Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pkg-config for glew linking #219

Merged
merged 3 commits into from
Oct 27, 2022
Merged

Use pkg-config for glew linking #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e7ef93
Use monomer.cabal with correct bounds for text-show
fjvallarino Oct 27, 2022
e1029d8
Use pkg-config for glew linking
fjvallarino Oct 27, 2022
4fa39f6
Use correct pkg-config-dependencies field (as defined in hpack)
fjvallarino Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions monomer.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ library
cbits/dpi.c
cbits/fontmanager.c
cbits/glew.c
pkgconfig-depends:
glew
build-tools:
c2hs
build-depends:
Expand All @@ -181,18 +183,18 @@ library
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if os(windows)
extra-libraries:
glew32
else
extra-libraries:
GLEW
default-language: Haskell2010

executable books
main-is: Main.hs
Expand Down Expand Up @@ -227,16 +229,16 @@ executable books
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

executable dev-test-app
main-is: Main.hs
Expand Down Expand Up @@ -269,7 +271,7 @@ executable dev-test-app
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
Expand Down Expand Up @@ -311,16 +313,16 @@ executable generative
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

executable opengl
main-is: Main.hs
Expand Down Expand Up @@ -355,16 +357,16 @@ executable opengl
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

executable ticker
main-is: Main.hs
Expand Down Expand Up @@ -400,18 +402,18 @@ executable ticker
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, websockets ==0.12.*
, wreq >=0.5.2 && <0.6
, wuss >=1.1 && <2.3
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

executable todo
main-is: Main.hs
Expand Down Expand Up @@ -445,16 +447,16 @@ executable todo
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

executable tutorial
main-is: Main.hs
Expand Down Expand Up @@ -496,16 +498,16 @@ executable tutorial
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
, wreq >=0.5.2 && <0.6
default-language: Haskell2010
if flag(examples)
buildable: True
else
buildable: False
default-language: Haskell2010

test-suite monomer-test
type: exitcode-stdio-1.0
Expand Down Expand Up @@ -589,7 +591,7 @@ test-suite monomer-test
, sdl2 >=2.5.0 && <2.6
, stm ==2.5.*
, text >=1.2 && <2.1
, text-show >=3.7 && <3.10
, text-show >=3.7 && <3.12
, time >=1.8 && <1.16
, transformers >=0.5 && <0.7
, vector >=0.12 && <0.14
Expand Down
1 change: 1 addition & 0 deletions package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ library:
- -fPIC
ghc-options:
- -fwarn-incomplete-patterns
pkg-config-dependencies: glew
when:
- condition: os(windows)
then:
Expand Down