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

turn off 32-bit and ARM exports, drop '64' from the folder name

Browse Source
This commit is contained in:
Ben Fry
2020-09-25 06:52:17 -04:00
parent df48876e37
commit bc6ed7e1a6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/processing/mode/java/JavaBuild.java
View File

@@ -561,6 +561,8 @@ public class JavaBuild {
final String arch = Platform.getNativeArch();
if (Library.hasMultipleArch(platform, importedLibraries)) {
// removing 32-bit export for 4.0 alpha 3
/*
// Don't try to export 32-bit on macOS, because it doesn't exist.
if (platform != PConstants.MACOS) {
// export the 32-bit version
@@ -569,11 +571,15 @@ public class JavaBuild {
return false;
}
}
*/
// export the 64-bit version
folder = new File(sketch.getFolder(), "application." + platformName + "64");
//folder = new File(sketch.getFolder(), "application." + platformName + "64");
// No longer including the 64 suffix in 4.0a3 because it's all 64-bit
folder = new File(sketch.getFolder(), "application." + platformName);
if (!exportApplication(folder, platform, "64", embedJava && (bits == 64) && "amd64".equals(arch))) {
return false;
}
/*
if (platform == PConstants.LINUX) {
// export the arm versions as well
folder = new File(sketch.getFolder(), "application.linux-armv6hf");
@@ -585,6 +591,7 @@ public class JavaBuild {
return false;
}
}
*/
} else { // just make a single one for this platform
folder = new File(sketch.getFolder(), "application." + platformName);
if (!exportApplication(folder, platform, "", embedJava)) {