Merge pull request #635 from hx2A/fixbuildonmacos

fix ant config so build can also run on macos

Author: hx2A

py5_jar/build.xml

@@ -18,7 +18,7 @@
         <mkdir dir="${project.bin}"/>
         <javac release="17" debug="true" includeantruntime="false" srcdir="${project.src}" destdir="${project.bin}">
             <classpath>
-                <fileset dir="${processing_dir}/lib/app/resources">
+                <fileset dir="${processing_dir}/app/resources">
                         <include name="**/*.jar"/>
                 </fileset>
             </classpath>

py5_jar/src/main/java/py5/core/SketchBase.java

@@ -66,7 +66,13 @@ public static void setJOGLProperties(String py5Path) {
       System.setProperty("jogamp.gluegen.UseTempJarCache", "false");
     }
 
-    String variant = PConstants.platformNames[PApplet.platform] + "-" + System.getProperty("os.arch");
+    String variant = PConstants.platformNames[PApplet.platform];
+    if (variant.equals("macos")) {
+      variant = "macosx-universal";
+    } else {
+      // TODO: may need to do something special for Raspberry Pi computers
+      variant += "-" + System.getProperty("os.arch");
+    }
     String joglPath = py5Path + File.separator + "natives" + File.separator + variant;
     String javaLibraryPath = System.getProperty("java.library.path");
     if (javaLibraryPath == null) {