Merge pull request processing#4005 from JakubValtar/embed-fix

JakubValtar · JakubValtar · commit 7da657c7e505 · 2015-10-20T17:37:22.000+02:00
Export - fix java not being embedded on 64bit
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -803,7 +803,7 @@ protected boolean exportApplication() throws IOException, SketchException {
           }
           // export the 64-bit version
           folder = new File(sketch.getFolder(), "application." + platformName + "64");
-          if (!exportApplication(folder, platform, "64", embedJava && Platform.getNativeBits() == 64 && "x86".equals(Platform.getNativeArch()))) {
+          if (!exportApplication(folder, platform, "64", embedJava && Platform.getNativeBits() == 64 && "amd64".equals(Platform.getNativeArch()))) {
             return false;
           }
           if (platform == PConstants.LINUX) {

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ protected boolean exportApplication() throws IOException, SketchException {`
`803`	`803`	`}`
`804`	`804`	`// export the 64-bit version`
`805`	`805`	`folder = new File(sketch.getFolder(), "application." + platformName + "64");`
`806`		`- if (!exportApplication(folder, platform, "64", embedJava && Platform.getNativeBits() == 64 && "x86".equals(Platform.getNativeArch()))) {`
	`806`	`+ if (!exportApplication(folder, platform, "64", embedJava && Platform.getNativeBits() == 64 && "amd64".equals(Platform.getNativeArch()))) {`
`807`	`807`	`return false;`
`808`	`808`	`}`
`809`	`809`	`if (platform == PConstants.LINUX) {`