eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 10:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

add 32/64 bit preference on OS X, tweak library errors for bit depths

Browse Source
This commit is contained in:
benfry
2011-11-01 16:26:08 +00:00
parent 66e7080b4d
commit 422692f125
7 changed files with 113 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/processing/mode/java/JavaBuild.java
View File

@@ -1095,6 +1095,23 @@ public class JavaBuild {
private boolean exportApplication(File destFolder,
int exportPlatform,
int exportBits) throws IOException, SketchException {
// TODO this should probably be a dialog box instead of a warning
// on the terminal. And the message should be written better than this.
// http://code.google.com/p/processing/issues/detail?id=884
for (Library library : importedLibraries) {
if (!library.supportsArch(exportPlatform, exportBits)) {
String pn = PConstants.platformNames[exportPlatform];
System.err.println("The application." + pn + exportBits +
" folder will not be created because no " +
exportBits + "-bit version of " +
library.getName() +
" is available for " + pn);
return true; // don't cancel export for this, just move along
}
}
/// prep the output directory
mode.prepareExportFolder(destFolder);

12
app/src/processing/mode/java/runner/Runner.java
View File

@@ -280,15 +280,9 @@ public class Runner implements MessageConsumer {
commandArgs =
"java -Xrunjdwp:transport=dt_shmem,address=" + addr + ",suspend=y ";
} else if (Base.isMacOS()) {
if (System.getProperty("os.version").startsWith("10.4")) {
// -d32 not understood by 10.4 (and not needed)
commandArgs =
"java -Xrunjdwp:transport=dt_socket,address=" + addr + ",suspend=y ";
} else {
commandArgs =
// "java -Xrunjdwp:transport=dt_socket,address=" + addr + ",suspend=y ";
"java -d32 -Xrunjdwp:transport=dt_socket,address=" + addr + ",suspend=y ";
}
commandArgs =
"java -d" + Preferences.get("run.options.bits") +
" -Xrunjdwp:transport=dt_socket,address=" + addr + ",suspend=y ";
}
for (int i = 0; i < vmParams.length; i++) {