eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2016-08-19 16:42:35 -04:00
parent a1e774b874 534ca5d86f
commit 2e9357839c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/windows/config-cmd.xml
+1 -1
View File
@@ -30,7 +30,7 @@
<jre>
<path>java</path>
<!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
<opt>-Djava.ext.dirs="%EXEDIR%/java/lib/ext"</opt>
<opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
<!-- Prevent a user-installed JNA from conflicting with our version.
https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
build/windows/config.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<jre>
<path>java</path>
<!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
<opt>-Djava.ext.dirs="%EXEDIR%/java/lib/ext"</opt>
<opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
<!-- https://github.com/processing/processing/issues/2239 -->
<opt>-Djna.nosys=true</opt>
<!-- Because nosys is set to true, the DLL in the current working
java/src/processing/mode/java/JavaBuild.java
+1 -1
View File
@@ -960,7 +960,7 @@ public class JavaBuild {
PApplet.javaVersionName +
".jdk/Contents/Home/jre/lib/ext");
} else if (exportPlatform == PConstants.WINDOWS) {
runOptions.append("-Djava.ext.dirs=\"%EXEDIR%/java/lib/ext\"");
runOptions.append("-Djava.ext.dirs=\"%EXEDIR%\\java\\lib\\ext\"");
} else if (exportPlatform == PConstants.LINUX) {
runOptions.append("-Djava.ext.dirs=\"$APPDIR/java/lib/ext\"");
}