Distinguish msys and other mingw environments

Author: tjammer

dune-project

@@ -1,13 +1,18 @@
-(lang dune 3.17)
+(lang dune 3.20)
+
 (using ctypes 0.3)
 
 (name raylib)
 
 (generate_opam_files true)
 
-(source (github tjammer/raylib-ocaml))
+(source
+ (github tjammer/raylib-ocaml))
+
 (license MIT)
+
 (authors "Tobias Mock")
+
 (maintainers "[email protected]")
 
 (package
@@ -16,52 +21,66 @@
  (description "OCaml bindings for raylib")
  (synopsis "OCaml bindings for raylib")
  (depends
-  (ocaml (>= 4.08.0))
-  (dune (>= 3.17))
-   dune-configurator
-  (ctypes (>= 0.14))
-  (integers (>= 0.5))
-  (patch (>= 3.0.0))
-  (conf-mesa (or (= :os linux) (= :os-family bsd)))
-  (conf-libxcursor (or (= :os linux) (= :os-family bsd)))
-  (conf-libxi (or (= :os linux) (= :os-family bsd)))
-  (conf-libxinerama (or (= :os linux) (= :os-family bsd)))
-  (conf-libxrandr (or (= :os linux) (= :os-family bsd)))))
+  (ocaml
+   (>= 4.08.0))
+  (dune
+   (>= 3.20))
+  dune-configurator
+  (ctypes
+   (>= 0.14))
+  (integers
+   (>= 0.5))
+  (patch
+   (>= 3.0.0))
+  (conf-mesa
+   (or
+    (= :os linux)
+    (= :os-family bsd)))
+  (conf-libxcursor
+   (or
+    (= :os linux)
+    (= :os-family bsd)))
+  (conf-libxi
+   (or
+    (= :os linux)
+    (= :os-family bsd)))
+  (conf-libxinerama
+   (or
+    (= :os linux)
+    (= :os-family bsd)))
+  (conf-libxrandr
+   (or
+    (= :os linux)
+    (= :os-family bsd)))))
 
 (package
  (name raygui)
  (version 1.5.0)
  (description "OCaml bindings for raygui")
  (synopsis "OCaml bindings for raygui")
  (depends
-  (ocaml (>= 4.05))
-  (dune (>= 3.17))
-   dune-configurator
-  (ctypes (>= 0.14))
-  (raylib (= :version))
-  (patch (>= 3.0.0))))
+  (raylib
+   (= :version))))
 
 (package
  (name raylib-callbacks)
  (version 1.5.0)
  (description "OCaml bindings for raygui")
  (synopsis "OCaml bindings for raygui")
  (depends
-  (ocaml (>= 4.05))
-  (dune (>= 3.17))
-   dune-configurator
-  (ctypes (>= 0.14))
-  (ctypes-foreign (>= 0.14))
-  (raylib (= :version))))
+  (ctypes-foreign
+   (>= 0.14))
+  (raylib
+   (= :version))))
 
 (package
  (name raylib-gen)
  (version 0.1.0)
  (description "Binding generation for raylib")
  (synopsis "Binding generation for raylib")
  (depends
-  (ocaml (>= 4.08.0))
-  (dune (>= 3.17))
-   yojson
-   re
-   containers))
+  (ocaml
+   (>= 4.08.0))
+  yojson
+  re
+  containers))

raygui.opam

@@ -9,12 +9,8 @@ license: "MIT"
 homepage: "https://github.com/tjammer/raylib-ocaml"
 bug-reports: "https://github.com/tjammer/raylib-ocaml/issues"
 depends: [
-  "ocaml" {>= "4.05"}
-  "dune" {>= "3.17" & >= "3.17"}
-  "dune-configurator"
-  "ctypes" {>= "0.14"}
+  "dune" {>= "3.20"}
   "raylib" {= version}
-  "patch" {>= "3.0.0"}
   "odoc" {with-doc}
 ]
 build: [
@@ -32,6 +28,7 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
+x-maintenance-intent: ["(latest)"]
 available: [arch != "arm32" & arch != "ppc64"]
 x-ci-accept-failures: [
   "centos-7" # C compiler is too old

raylib-callbacks.opam

@@ -9,10 +9,7 @@ license: "MIT"
 homepage: "https://github.com/tjammer/raylib-ocaml"
 bug-reports: "https://github.com/tjammer/raylib-ocaml/issues"
 depends: [
-  "ocaml" {>= "4.05"}
-  "dune" {>= "3.17" & >= "3.17"}
-  "dune-configurator"
-  "ctypes" {>= "0.14"}
+  "dune" {>= "3.20"}
   "ctypes-foreign" {>= "0.14"}
   "raylib" {= version}
   "odoc" {with-doc}
@@ -32,3 +29,4 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
+x-maintenance-intent: ["(latest)"]

raylib-gen.opam

@@ -9,8 +9,8 @@ license: "MIT"
 homepage: "https://github.com/tjammer/raylib-ocaml"
 bug-reports: "https://github.com/tjammer/raylib-ocaml/issues"
 depends: [
+  "dune" {>= "3.20"}
   "ocaml" {>= "4.08.0"}
-  "dune" {>= "3.17" & >= "3.17"}
   "yojson"
   "re"
   "containers"
@@ -31,3 +31,4 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
+x-maintenance-intent: ["(latest)"]

raylib.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/tjammer/raylib-ocaml"
 bug-reports: "https://github.com/tjammer/raylib-ocaml/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "dune" {>= "3.17" & >= "3.17"}
+  "dune" {>= "3.20" & >= "3.20"}
   "dune-configurator"
   "ctypes" {>= "0.14"}
   "integers" {>= "0.5"}
@@ -37,6 +37,7 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
+x-maintenance-intent: ["(latest)"]
 available: [arch != "arm32" & arch != "ppc64"]
 x-ci-accept-failures: [
   "centos-7" # C compiler is too old

src/c/dune

@@ -66,7 +66,9 @@
  (alias build-raylib)
  (targets libraylib.a dllraylib.dll)
  (enabled_if
-  (= %{system} mingw64))
+  (and
+   (= %{system} mingw64)
+   (<> %{os_distribution} msys2)))
  (deps
   (source_tree vendor/raylib)
   enable_formats.patch
@@ -86,6 +88,32 @@
     (run make -C vendor/raylib/src RAYLIB_LIBTYPE=SHARED -j 8)
     (copy vendor/raylib/src/raylib.dll dllraylib.dll)))))
 
+(rule
+ (alias build-raylib)
+ (targets libraylib.a dllraylib.dll)
+ (enabled_if
+  (and
+   (= %{system} mingw64)
+   (= %{os_distribution} msys2)))
+ (deps
+  (source_tree vendor/raylib)
+  enable_formats.patch
+  msys2.patch
+  apply_patch.exe
+  chmodx.exe)
+ (action
+  (no-infer
+   (progn
+    (run ./chmodx.exe vendor/raylib/src/config.h)
+    (run ./apply_patch.exe enable_formats.patch)
+    (run ./chmodx.exe vendor/raylib/src/Makefile)
+    (run ./apply_patch.exe msys2.patch)
+    (run make -C vendor/raylib/src RAYLIB_LIBTYPE=STATIC -j 8)
+    (copy vendor/raylib/src/libraylib.a libraylib.a)
+    (run make -C vendor/raylib/src clean)
+    (run make -C vendor/raylib/src RAYLIB_LIBTYPE=SHARED -j 8)
+    (copy vendor/raylib/src/raylib.dll dllraylib.dll)))))
+
 (rule
  (alias build-raylib)
  (targets libraylib.a dllraylib.so)

src/c/msys2.patch

@@ -0,0 +1,23 @@
+diff --git a/vendor/raylib/src/Makefile b/vendor/raylib/src/Makefile
+index 7dde52fb..9df71f4f 100644
+--- a/vendor/raylib/src/Makefile
++++ b/vendor/raylib/src/Makefile
+@@ -266,8 +266,8 @@ endif
+ 
+ # Define default C compiler and archiver to pack library: CC, AR
+ #------------------------------------------------------------------------------------------------
+-CC = gcc
++CC = x86_64-w64-mingw32-gcc
+ AR = ar
+ 
+ ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW)
+     ifeq ($(PLATFORM_OS),OSX)
+@@ -669,7 +669,7 @@ else
+         ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW PLATFORM_DESKTOP_SDL PLATFORM_DESKTOP_RGFW))
+             ifeq ($(PLATFORM_OS),WINDOWS)
+                 # NOTE: Linking with provided resource file
+-				$(CC) -shared -o $(RAYLIB_RELEASE_PATH)/$(RAYLIB_LIB_NAME).dll $(OBJS) $(RAYLIB_RES_FILE) $(LDFLAGS) $(LDLIBS)
++				$(CC) -shared -o $(RAYLIB_RELEASE_PATH)/$(RAYLIB_LIB_NAME).dll $(OBJS) $(LDFLAGS) $(LDLIBS)
+ 				@echo "raylib dynamic library ($(RAYLIB_LIB_NAME).dll) and import library (lib$(RAYLIB_LIB_NAME)dll.a) generated!"
+             endif
+             ifeq ($(PLATFORM_OS),LINUX)