removing cross-platform export

This commit is contained in:
Ben Fry
2013-10-20 09:54:03 -04:00
parent 093bc6cde6
commit a8ff4db245
3 changed files with 43 additions and 66 deletions

View File

@@ -1090,6 +1090,7 @@ public class JavaBuild {
return false;
}
/*
File folder = null;
for (String platformName : PConstants.platformNames) {
int platform = Base.getPlatformIndex(platformName);
@@ -1113,17 +1114,31 @@ public class JavaBuild {
}
}
}
*/
File folder = null;
String platformName = Base.getPlatformName();
if (Library.hasMultipleArch(PApplet.platform, importedLibraries)) {
// export the 32-bit version
folder = new File(sketch.getFolder(), "application." + platformName + "32");
if (!exportApplication(folder, PApplet.platform, 32)) {
return false;
}
// export the 64-bit version
folder = new File(sketch.getFolder(), "application." + platformName + "64");
if (!exportApplication(folder, PApplet.platform, 64)) {
return false;
}
} else { // just make a single one for this platform
folder = new File(sketch.getFolder(), "application." + platformName);
if (!exportApplication(folder, PApplet.platform, 0)) {
return false;
}
}
return true; // all good
}
// public boolean exportApplication(String destPath,
// String platformName,
// int exportBits) throws IOException, RunnerException {
// return exportApplication(destPath, Base.getPlatformIndex(platformName), exportBits);
// }
/**
* Export to application without GUI. Also called by the Commander.
*/