Skip to content

Commit db81dda

Browse files
committed
1 parent f0267f2 commit db81dda

File tree

2 files changed

+49
-47
lines changed

2 files changed

+49
-47
lines changed

package.yaml

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,43 @@ library:
3535
- -Wno-missing-signatures
3636
- -Wno-partial-type-signatures
3737

38-
_: &is-example
39-
when:
40-
- condition: flag(build-examples)
41-
then:
42-
buildable: true
43-
else:
44-
buildable: false
45-
4638
executables:
4739
info:
4840
main: Main.hs
4941
source-dirs: examples/info
50-
dependencies:
51-
- base < 4.14
52-
- vulkan
53-
- pretty-simple
54-
<<: *is-example
42+
when:
43+
- condition: flag(build-examples)
44+
then:
45+
buildable: true
46+
dependencies:
47+
- base < 4.14
48+
- vulkan
49+
- pretty-simple
50+
else:
51+
buildable: false
5552

5653
sdl-triangle:
5754
main: Main.hs
5855
source-dirs: examples/sdl-triangle
59-
dependencies:
60-
- base < 4.14
61-
- bytestring
62-
- extra
63-
- managed
64-
- pretty-show
65-
- say
66-
- sdl2
67-
- text
68-
- transformers
69-
- vector
70-
- vulkan
56+
when:
57+
- condition: flag(build-examples)
58+
then:
59+
buildable: true
60+
dependencies:
61+
- base < 4.14
62+
- bytestring
63+
- extra
64+
- managed
65+
- pretty-show
66+
- say
67+
- sdl2
68+
- text
69+
- transformers
70+
- vector
71+
- vulkan
72+
else:
73+
buildable: false
7174
c-sources: examples/sdl-triangle/DebugCallback.c
72-
<<: *is-example
7375

7476
flags:
7577
safe-foreign-calls:
@@ -78,13 +80,13 @@ flags:
7880
callbacks from Vulkan to Haskell will work. If you are using
7981
these then make sure this flag is enabled.
8082
default: yes
81-
manual: no
83+
manual: yes
8284

8385
build-examples:
8486
description:
8587
Build example executables
8688
default: no
87-
manual: no
89+
manual: yes
8890

8991
default-extensions:
9092
- AllowAmbiguousTypes

vulkan.cabal

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cabal-version: 1.12
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: f7e72b88e88eab9cd679e001a8d67909870b2518cf620ea811ea4a85ef28355c
7+
-- hash: 114c0fde74e474e875021865600ff7eb6f54ffb28ef52a9fd385840b8e68d414
88

99
name: vulkan
1010
version: 3.0.0.0
@@ -29,12 +29,12 @@ source-repository head
2929

3030
flag build-examples
3131
description: Build example executables
32-
manual: False
32+
manual: True
3333
default: False
3434

3535
flag safe-foreign-calls
3636
description: Do not mark foreign imports as 'unsafe'. This means that callbacks from Vulkan to Haskell will work. If you are using these then make sure this flag is enabled.
37-
manual: False
37+
manual: True
3838
default: True
3939

4040
library
@@ -482,11 +482,11 @@ executable info
482482
hs-source-dirs:
483483
examples/info
484484
default-extensions: AllowAmbiguousTypes CPP DataKinds DefaultSignatures DeriveAnyClass DerivingStrategies DuplicateRecordFields FlexibleContexts FlexibleInstances GADTs GeneralizedNewtypeDeriving InstanceSigs LambdaCase MagicHash NoMonomorphismRestriction OverloadedStrings PartialTypeSignatures PatternSynonyms PolyKinds QuantifiedConstraints RankNTypes RecordWildCards RoleAnnotations ScopedTypeVariables StandaloneDeriving Strict TypeApplications TypeFamilyDependencies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns
485-
build-depends:
486-
base <4.14
487-
, pretty-simple
488-
, vulkan
489485
if flag(build-examples)
486+
build-depends:
487+
base <4.14
488+
, pretty-simple
489+
, vulkan
490490
buildable: True
491491
else
492492
buildable: False
@@ -501,19 +501,19 @@ executable sdl-triangle
501501
default-extensions: AllowAmbiguousTypes CPP DataKinds DefaultSignatures DeriveAnyClass DerivingStrategies DuplicateRecordFields FlexibleContexts FlexibleInstances GADTs GeneralizedNewtypeDeriving InstanceSigs LambdaCase MagicHash NoMonomorphismRestriction OverloadedStrings PartialTypeSignatures PatternSynonyms PolyKinds QuantifiedConstraints RankNTypes RecordWildCards RoleAnnotations ScopedTypeVariables StandaloneDeriving Strict TypeApplications TypeFamilyDependencies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns
502502
c-sources:
503503
examples/sdl-triangle/DebugCallback.c
504-
build-depends:
505-
base <4.14
506-
, bytestring
507-
, extra
508-
, managed
509-
, pretty-show
510-
, say
511-
, sdl2
512-
, text
513-
, transformers
514-
, vector
515-
, vulkan
516504
if flag(build-examples)
505+
build-depends:
506+
base <4.14
507+
, bytestring
508+
, extra
509+
, managed
510+
, pretty-show
511+
, say
512+
, sdl2
513+
, text
514+
, transformers
515+
, vector
516+
, vulkan
517517
buildable: True
518518
else
519519
buildable: False

0 commit comments

Comments
 (0)