Skip to content

Commit a15f6eb

Browse files
committed
Fix opam build for callback package
1 parent 8499e83 commit a15f6eb

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ jobs:
4646
- run: opam exec -- dune build
4747
if: matrix.ocaml-compiler != '4.08.0'
4848

49-
- run: opam install raylib raygui
50-
if: matrix.ocaml-compiler == '4.08.0'
49+
- run: opam install .

dune-project

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
(name raylib)
55

6-
; cannot specify conditional deps otherwise
7-
(generate_opam_files false)
6+
(generate_opam_files true)
87

98
(source (github tjammer/raylib-ocaml))
109
(license MIT)
@@ -22,7 +21,12 @@
2221
dune-configurator
2322
(ctypes (>= 0.14))
2423
(integers (>= 0.5))
25-
(patch (>= 3.0.0))))
24+
(patch (>= 3.0.0))
25+
(conf-mesa (or (= :os linux) (= :os-family bsd)))
26+
(conf-libxcursor (or (= :os linux) (= :os-family bsd)))
27+
(conf-libxi (or (= :os linux) (= :os-family bsd)))
28+
(conf-libxinerama (or (= :os linux) (= :os-family bsd)))
29+
(conf-libxrandr (or (= :os linux) (= :os-family bsd)))))
2630

2731
(package
2832
(name raygui)
@@ -34,7 +38,7 @@
3438
(dune (>= 3.17))
3539
dune-configurator
3640
(ctypes (>= 0.14))
37-
(raylib (>= 1.4.0))
41+
(raylib (= :version))
3842
(patch (>= 3.0.0))))
3943

4044
(package
@@ -48,7 +52,7 @@
4852
dune-configurator
4953
(ctypes (>= 0.14))
5054
(ctypes-foreign (>= 0.14))
51-
(raylib (>= 1.4.0))))
55+
(raylib (= :version))))
5256

5357
(package
5458
(name raylib-gen)

raygui.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ depends: [
1313
"dune" {>= "3.17" & >= "3.17"}
1414
"dune-configurator"
1515
"ctypes" {>= "0.14"}
16-
"raylib" {>= "1.4.0"}
16+
"raylib" {= version}
1717
"patch" {>= "3.0.0"}
1818
"odoc" {with-doc}
1919
]

raylib-callbacks.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ depends: [
1414
"dune-configurator"
1515
"ctypes" {>= "0.14"}
1616
"ctypes-foreign" {>= "0.14"}
17-
"raylib" {>= "1.4.0"}
17+
"raylib" {= version}
1818
"odoc" {with-doc}
1919
]
2020
build: [

raylib.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ depends: [
1414
"dune-configurator"
1515
"ctypes" {>= "0.14"}
1616
"integers" {>= "0.5"}
17+
"patch" {>= "3.0.0"}
1718
"conf-mesa" {os = "linux" | os-family = "bsd"}
1819
"conf-libxcursor" {os = "linux" | os-family = "bsd"}
1920
"conf-libxi" {os = "linux" | os-family = "bsd"}
2021
"conf-libxinerama" {os = "linux" | os-family = "bsd"}
2122
"conf-libxrandr" {os = "linux" | os-family = "bsd"}
22-
"patch" {>= "3.0.0"}
2323
"odoc" {with-doc}
2424
]
2525
build: [

src/c/raylib_callbacks/dune

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
(instance Functions)
1818
(functor Functions))
1919
(generated_types Raylib_callbacks_types_generated)
20-
(generated_entry_point Raylib_callbacks_generated))
20+
(generated_entry_point Raylib_callbacks_generated)
21+
(deps
22+
(source_tree ../vendor/raylib)))
2123
(library_flags
2224
(:include ../library_flags.sexp)))

0 commit comments

Comments
 (0)