From 5c0cbd83b73472c2e7603bac69e62e5684ad4879 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Sun, 20 Oct 2013 17:31:28 -0400 Subject: [PATCH] only export a single platform bit-wise --- app/src/processing/mode/java/JavaBuild.java | 21 ++++++++++++--------- core/todo.txt | 2 +- todo.txt | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java index 72794898e..f09a2e1fe 100644 --- a/app/src/processing/mode/java/JavaBuild.java +++ b/app/src/processing/mode/java/JavaBuild.java @@ -1119,15 +1119,18 @@ 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; + if (Base.getNativeBits() == 32) { + // export the 32-bit version + folder = new File(sketch.getFolder(), "application." + platformName + "32"); + if (!exportApplication(folder, PApplet.platform, 32)) { + return false; + } + } else if (Base.getNativeBits() == 64) { + // 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); diff --git a/core/todo.txt b/core/todo.txt index da781dc1c..2aef287cc 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,4 +1,4 @@ -0222 core +0222 core (2.1b1) X background color for present mode has no effect X https://github.com/processing/processing/issues/2071 X https://github.com/processing/processing/pull/2072 diff --git a/todo.txt b/todo.txt index f50ff5748..f90ca0ccc 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,4 @@ -0222 pde +0222 pde (2.1b1) X MovieMaker needs to be compiling as 1.6 X deal with null/missing folders for Tools and Modes X https://github.com/processing/processing/issues/2068