Skip to content

Commit 2e44a69

Browse files
committed
allegro5: Replace the non-working configuration for msys2 with a configuration close to SDL2’s
1 parent 860bdab commit 2e44a69

File tree

3 files changed

+38
-1
lines changed
  • packages
    • conf-allegro5/conf-allegro5.1
    • conf-mingw-w64-allegro5-i686/conf-mingw-w64-allegro5-i686.1
    • conf-mingw-w64-allegro5-x86_64/conf-mingw-w64-allegro5-x86_64.1

3 files changed

+38
-1
lines changed

packages/conf-allegro5/conf-allegro5.1/opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ depexts: [
3333
["allegro"] {os-distribution = "homebrew"}
3434
["allegro5"] {os = "freebsd"}
3535
["allegro5"] {os = "netbsd"}
36-
["mingw-w64-allegro"] {os-distribution = "msys2"}
3736
]
3837
synopsis: "Virtual package relying on Allegro 5 development libraries"
3938
description:
4039
"This package can only install if Allegro 5 development libraries are accessible through pkg-config."
4140
depends: [
4241
"conf-pkg-config" {build}
42+
("host-arch-x86_32" {os-distribution = "msys2"} & "conf-mingw-w64-sdl2-i686" {os-distribution = "msys2"} |
43+
"host-arch-x86_64" {os-distribution = "msys2"} & "conf-mingw-w64-sdl2-x86_64" {os-distribution = "msys2"})
4344
]
4445
flags: conf
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
opam-version: "2.0"
2+
authors: "The Allegro authors"
3+
homepage: "https://liballeg.org"
4+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
5+
license: "Giftware"
6+
flags: conf
7+
available: os = "win32"
8+
build: ["pkgconf" "--personality=i686-w64-mingw32" "allegro5"]
9+
depends: [
10+
"conf-pkg-config" {build}
11+
]
12+
synopsis: "allegro5 for i686 mingw-w64"
13+
description:
14+
"Ensure the i686 version of allegro5 for the mingw-w64 project is available"
15+
maintainer: "Sylvain Chiron <[email protected]>"
16+
depexts: [
17+
["mingw-w64-i686-allegro5"] {os = "win32" & os-distribution = "msys2"}
18+
]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
opam-version: "2.0"
2+
authors: "The Allegro authors"
3+
homepage: "https://liballeg.org"
4+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
5+
license: "Giftware"
6+
flags: conf
7+
available: os = "win32"
8+
build: ["pkgconf" "--personality=x86_64-w64-mingw32" "allegro5"]
9+
depends: [
10+
"conf-pkg-config" {build}
11+
]
12+
synopsis: "allegro5 for x86_64 mingw-w64"
13+
description:
14+
"Ensure the x86_64 version of allegro5 for the mingw-w64 project is available"
15+
maintainer: "Sylvain Chiron <[email protected]>"
16+
depexts: [
17+
["mingw-w64-x86_64-allegro5"] {os = "win32" & os-distribution = "msys2"}
18+
]

0 commit comments

Comments
 (0)