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

Merge pull request #4406 from gohai/arm-export-memory

Browse Source 
Ignore memory options when exporting for ARM
This commit is contained in:
Ben Fry
2016-05-08 15:09:32 -04:00
parent 822089487b e127659bc5
commit e4460a5b2e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1123,7 +1123,11 @@ public class JavaBuild {
/// figure out run options for the VM
List<String> runOptions = new ArrayList<String>();
if (Preferences.getBoolean("run.options.memory")) {
// set memory options, except for ARM where we're more memory-constrained compared
// to the machine the user might be building the sketch on
if (Preferences.getBoolean("run.options.memory") &&
!exportVariant.equals("armv6hf")) {
runOptions.add("-Xms" + Preferences.get("run.options.memory.initial") + "m");
runOptions.add("-Xmx" + Preferences.get("run.options.memory.maximum") + "m");
}