Skip to content

Commit

Permalink
Merge pull request #20 from ocaml/fix-win-deps
Browse files Browse the repository at this point in the history
Don't depend on x11 and pkg-config on Windows
  • Loading branch information
dra27 authored Dec 23, 2020
2 parents c9e653b + ef50e3a commit 8f8ab8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Next

- Fix configurator detection on native Windows (#19, @fdopen)
- Use caml_alloc_custom_mem when available (#23, @hhugo)
- Fix windows dependencies (#20, @diml)

5.1.0 (05/12/2019)
------------------
Expand Down
6 changes: 3 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 2.0)
(lang dune 2.1)
(name graphics)

(generate_opam_files true)
Expand All @@ -17,8 +17,8 @@
(name graphics)
(depends
"dune-configurator"
"conf-libX11"
"conf-pkg-config"
("conf-libX11" (<> :os win32))
("conf-pkg-config" (<> :os win32))
("ocaml" (>= "4.09.0~~")))
(synopsis "The OCaml graphics library")
(description "\
Expand Down
6 changes: 3 additions & 3 deletions graphics.opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ homepage: "https://github.com/ocaml/graphics"
doc: "https://ocaml.github.io/graphics/"
bug-reports: "https://github.com/ocaml/graphics/issues"
depends: [
"dune" {>= "2.0"}
"dune" {>= "2.1"}
"dune-configurator"
"conf-libX11"
"conf-pkg-config"
"conf-libX11" {os != "win32"}
"conf-pkg-config" {os != "win32"}
"ocaml" {>= "4.09.0~~"}
]
build: [
Expand Down

0 comments on commit 8f8ab8a

Please sign in to comment.