fix the library export issues

benfry · benfry · commit 1824067cd5ac · 2015-09-01T11:45:25.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -10025,6 +10025,8 @@ static public void runSketch(final String[] args,
     // Remove 60fps limit on the JavaFX "pulse" timer
     System.setProperty("javafx.animation.fullspeed", "true");
 
+    // This doesn't work, need to mess with Info.plist instead
+    /*
     // In an exported application, add the Contents/Java folder to the
     // java.library.path, so that native libraries work properly.
     // Without this, the library path is only set to Contents/MacOS
@@ -10042,6 +10044,7 @@ static public void runSketch(final String[] args,
         System.setProperty("java.library.path", libraryPath);
       }
     }
+    */
 
     // Catch any HeadlessException to provide more useful feedback
     try {
diff --git a/java/application/Info.plist.tmpl b/java/application/Info.plist.tmpl
@@ -60,7 +60,8 @@
     <key>JVMOptions</key>
     <array>
 @@jvm_options_list@@
-      <string>-Xdock:icon=Contents/Resources/sketch.icns</string>
+      <string>-Xdock:icon=$APP_ROOT/Contents/Resources/sketch.icns</string>
+      <string>-Djava.library.path=$APP_ROOT/Contents/Java</string>   
       <string>-Dapple.laf.useScreenMenuBar=true</string>
       <string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
       <string>-Dcom.apple.macos.useScreenMenuBar=true</string>

Original file line number	Diff line number	Diff line change
`@@ -10025,6 +10025,8 @@ static public void runSketch(final String[] args,`
`10025`	`10025`	`// Remove 60fps limit on the JavaFX "pulse" timer`
`10026`	`10026`	`System.setProperty("javafx.animation.fullspeed", "true");`
`10027`	`10027`
	`10028`	`+ // This doesn't work, need to mess with Info.plist instead`
	`10029`	`+ /*`
`10028`	`10030`	`// In an exported application, add the Contents/Java folder to the`
`10029`	`10031`	`// java.library.path, so that native libraries work properly.`
`10030`	`10032`	`// Without this, the library path is only set to Contents/MacOS`
`@@ -10042,6 +10044,7 @@ static public void runSketch(final String[] args,`
`10042`	`10044`	`System.setProperty("java.library.path", libraryPath);`
`10043`	`10045`	`}`
`10044`	`10046`	`}`
	`10047`	`+ */`
`10045`	`10048`
`10046`	`10049`	`// Catch any HeadlessException to provide more useful feedback`
`10047`	`10050`	`try {`