cirrus ci macos arm64 build

electronstudio · Nov 5, 2023 · dbd330f · dbd330f
1 parent df1a4e4
commit dbd330f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -8,8 +8,10 @@ task:
     RAYLIB_PLATFORM: macosx-arm64
   setup_script:
     - brew update
+    - brew uninstall temurin8
     - brew install java11
-    - sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk
+    - sudo ln -sfn /opt/homebrew/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk
+    - export CPPFLAGS="-I/opt/homebrew/opt/openjdk@11/include"
   build_raylib_script:
     - git submodule update --init --recursive
     - cd raylib

diff --git a/build-native.sh b/build-native.sh
@@ -2,6 +2,7 @@
 echo "STEP 1 - move compilation results from gen folder to natives folder"
 rm -rf natives
 mkdir -p natives/com/raylib/$RAYLIB_PLATFORM
+ls gen/com/raylib
 mv -f gen/com/raylib/$RAYLIB_PLATFORM/* natives/com/raylib/$RAYLIB_PLATFORM/
 
 echo "STEP 2 -  native jar archive"

diff --git a/src/com/raylib/RaylibConfig.java b/src/com/raylib/RaylibConfig.java
@@ -23,7 +23,14 @@
                         include = {"raylib.h", "rlgl.h", "raymath.h", "physac.h", "raygui.h"},
                         compiler = {"!default","foo"}
                 ),
-
+                @Platform(
+                        value = {"macosx-arm64"},
+                        //linkpath = {"."},
+                        link = {"raylib"},
+                        //includepath = {"/Users/richard/IdeaProjects/jaylib"},
+                        include = {"raylib.h", "rlgl.h", "raymath.h", "physac.h", "raygui.h"},
+                        compiler = {"!default","foo"}
+                ),
                 @Platform(
                         value = {"linux-x86_64"},
                         linkpath = {"/usr/lib/x86_64-linux-gnu"}, // "/home/richard/jaylib/lib/linux"