macOS: bundle GLFW+GLEW dylibs, add CI workflow to build them

Author: pepc84

.github/workflows/build-macos-libs.yml

@@ -0,0 +1,53 @@
+name: Build macOS bundled libs (GLFW + GLEW)
+
+on:
+  workflow_dispatch:  # manual trigger only
+
+jobs:
+  build:
+    runs-on: macos-latest  # arm64 runner
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install GLFW and GLEW via Homebrew
+        run: brew install glfw glew
+
+      - name: Collect and fix dylib install names
+        run: |
+          mkdir -p libs/macos-arm64
+
+          # GLFW
+          GLFW=$(brew --prefix glfw)/lib/libglfw.3.dylib
+          cp "$GLFW" libs/macos-arm64/libglfw.3.dylib
+          install_name_tool -id @rpath/libglfw.3.dylib libs/macos-arm64/libglfw.3.dylib
+
+          # GLEW
+          GLEW=$(brew --prefix glew)/lib/libGLEW.dylib
+          # Get actual versioned name
+          GLEW_VER=$(ls $(brew --prefix glew)/lib/libGLEW.*.dylib | head -1)
+          GLEW_BASE=$(basename "$GLEW_VER")
+          cp "$GLEW_VER" libs/macos-arm64/$GLEW_BASE
+          install_name_tool -id @rpath/$GLEW_BASE libs/macos-arm64/$GLEW_BASE
+          # Also create libGLEW.dylib symlink-equivalent copy
+          cp "$GLEW_VER" libs/macos-arm64/libGLEW.dylib
+          install_name_tool -id @rpath/libGLEW.dylib libs/macos-arm64/libGLEW.dylib
+
+          echo "=== arm64 libs ==="
+          file libs/macos-arm64/*.dylib
+          otool -L libs/macos-arm64/libglfw.3.dylib
+          otool -L libs/macos-arm64/libGLEW.dylib
+
+      - name: Upload as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-arm64-libs
+          path: libs/macos-arm64/
+
+      - name: Commit to repo
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add libs/macos-arm64/
+          git diff --staged --quiet || git commit -m "ci: add bundled macOS arm64 GLFW+GLEW dylibs"
+          git push

mode/CppMode.jar

@@ -459,9 +459,17 @@ else if (ch == 1) {
         boolean macGpp = false;
         try { macGpp = Runtime.getRuntime().exec(new String[]{"g++","--version"}).waitFor()==0; }
         catch (Exception ignored) {}
-        boolean macGlfw = new File("/opt/homebrew/include/GLFW/glfw3.h").exists()
+        String macArch = System.getProperty("os.arch","").contains("aarch64") ? "arm64" : "x64";
+        File macLibsDir = new File(System.getProperty("user.home") +
+            "/Library/Application Support/Processing/modes/CppMode/libs/macos-" + macArch);
+        // Also check relative to the mode's own directory
+        boolean hasBundledGlfw = new File(macLibsDir, "libglfw.3.dylib").exists();
+        boolean hasBundledGlew = new File(macLibsDir, "libGLEW.dylib").exists();
+        boolean macGlfw = hasBundledGlfw
+                       || new File("/opt/homebrew/include/GLFW/glfw3.h").exists()
                        || new File("/usr/local/include/GLFW/glfw3.h").exists();
-        boolean macGlew = new File("/opt/homebrew/include/GL/glew.h").exists()
+        boolean macGlew = hasBundledGlew
+                       || new File("/opt/homebrew/include/GL/glew.h").exists()
                        || new File("/usr/local/include/GL/glew.h").exists();
         if (macGpp && macGlfw && macGlew) return; // everything present, skip wizard
         // Try the guided installer first (Xcode Command Line Tools, then
@@ -3164,10 +3172,17 @@ else if (!cmd.contains(defaultsCpp.getAbsolutePath()))
         "-lcomdlg32", "-lshell32", "-lole32", "-luuid",
         "-mwindows", "-pthread", "-D_USE_MATH_DEFINES");
     } else if (mac) {
-      // macOS has no separate libGL/libGLU — OpenGL is a system framework,
-      // bundled with Xcode Command Line Tools (no extra install needed).
-      // GLFW/GLEW come from Homebrew, so link against its lib directory too.
-      if (homebrewPrefix != null) {
+      // macOS: prefer bundled dylibs shipped with the mode (libs/macos-arm64
+      // or libs/macos-x64) so users need no Homebrew install at all.
+      String arch = System.getProperty("os.arch","").contains("aarch64") ? "arm64" : "x64";
+      File macLibsDir = new File(runtimeDir.getParentFile(), "libs/macos-" + arch);
+      boolean hasBundled = new File(macLibsDir, "libglfw.3.dylib").exists()
+                        && new File(macLibsDir, "libGLEW.dylib").exists();
+      if (hasBundled) {
+        cmd.add("-L" + macLibsDir.getAbsolutePath());
+        cmd.add("-Wl,-rpath," + macLibsDir.getAbsolutePath());
+        cmd.add("-Wl,-rpath,@executable_path");
+      } else if (homebrewPrefix != null) {
         cmd.add("-L" + homebrewPrefix + "/lib");
       }
       Collections.addAll(cmd, "-lglfw", "-lGLEW", "-lm", "-pthread");