macOS: use bundled GLFW+GLEW dylibs, copy to sketch folder at build time, update detection

Author: pepc84

mode/CppMode.jar

@@ -460,9 +460,10 @@ else if (ch == 1) {
         try { macGpp = Runtime.getRuntime().exec(new String[]{"g++","--version"}).waitFor()==0; }
         catch (Exception ignored) {}
         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
+        File macLibsDir = (runtimeDir != null)
+            ? new File(runtimeDir.getParentFile(), "libs/macos-" + macArch)
+            : new File(System.getProperty("user.home") +
+                "/Library/Application Support/Processing/modes/CppMode/libs/macos-" + macArch);
         boolean hasBundledGlfw = new File(macLibsDir, "libglfw.3.dylib").exists();
         boolean hasBundledGlew = new File(macLibsDir, "libGLEW.dylib").exists();
         boolean macGlfw = hasBundledGlfw
@@ -636,6 +637,18 @@ public File compile(RunnerListener listener) throws Exception {
       if (!dest.exists())
         java.nio.file.Files.copy(font.toPath(), dest.toPath());
     }
+    // Copy bundled macOS dylibs to sketch folder so the binary finds them at runtime.
+    if (isMac) {
+      String macArch2 = System.getProperty("os.arch","").contains("aarch64") ? "arm64" : "x64";
+      File macLibsDir2 = new File(runtimeDir.getParentFile(), "libs/macos-" + macArch2);
+      if (macLibsDir2.exists()) {
+        for (File dylib : macLibsDir2.listFiles((d,n) -> n.endsWith(".dylib"))) {
+          File destDylib = new File(sketch.getFolder(), dylib.getName());
+          if (!destDylib.exists())
+            java.nio.file.Files.copy(dylib.toPath(), destDylib.toPath());
+        }
+      }
+    }
     listener.statusNotice("Built: " + binary.getName());
 
     // Check for required native libraries on all platforms

src/java/CppBuild.java

@@ -392,12 +392,18 @@ private java.util.List<String> detectMacMissing() {
     boolean haveCompiler = commandExists("xcrun", "-find", "g++")
                         || commandExists("g++", "--version");
     // Check headers (needed at compile time) not just dylibs (needed at link time).
-    boolean glfwOk = new File("/opt/homebrew/include/GLFW/glfw3.h").exists()
+    // Check bundled dylibs first (shipped with the mode, no Homebrew needed)
+    String macArch = System.getProperty("os.arch","").contains("aarch64") ? "arm64" : "x64";
+    String home = System.getProperty("user.home");
+    File bundledLibs = new File(home + "/Library/Application Support/Processing/modes/CppMode/libs/macos-" + macArch);
+    boolean glfwOk = new File(bundledLibs, "libglfw.3.dylib").exists()
+                  || new File("/opt/homebrew/include/GLFW/glfw3.h").exists()
                   || new File("/usr/local/include/GLFW/glfw3.h").exists()
                   || new File("/opt/homebrew/lib/libglfw.dylib").exists()
                   || new File("/usr/local/lib/libglfw.dylib").exists()
                   || commandExists("pkg-config", "--exists", "glfw3");
-    boolean glewOk = new File("/opt/homebrew/include/GL/glew.h").exists()
+    boolean glewOk = new File(bundledLibs, "libGLEW.dylib").exists()
+                  || new File("/opt/homebrew/include/GL/glew.h").exists()
                   || new File("/usr/local/include/GL/glew.h").exists()
                   || new File("/opt/homebrew/lib/libGLEW.dylib").exists()
                   || new File("/usr/local/lib/libGLEW.dylib").exists()