Merge pull request processing#3451 from GKFX/processing-java-platform

benfry · benfry · commit 03914889d32e · 2015-07-03T10:20:39.000-04:00
Fix processing#2760: allow exports to other platforms again.
diff --git a/java/src/processing/mode/java/Commander.java b/java/src/processing/mode/java/Commander.java
@@ -142,13 +142,13 @@ public Commander(String[] args) {
         embedJava = false;
 
       } else if (arg.startsWith(platformArg)) {
-        complainAndQuit("The --platform option has been removed from Processing 2.1.", false);
-//        String platformStr = arg.substring(platformArg.length());
-//        platform = Base.getPlatformIndex(platformStr);
-//        if (platform == -1) {
-//          complainAndQuit(platformStr + " should instead be " +
-//                          "'windows', 'macosx', or 'linux'.", true);
-//        }
+//        complainAndQuit("The --platform option has been removed from Processing 2.1.", false);
+        String platformStr = arg.substring(platformArg.length());
+        platform = Base.getPlatformIndex(platformStr);
+        if (platform == -1) {
+          complainAndQuit(platformStr + " should instead be " +
+                          "'windows', 'macosx', or 'linux'.", true);
+        }
 
       } else if (arg.startsWith(bitsArg)) {
         complainAndQuit("The --bits option has been removed from Processing 2.1.", false);
@@ -377,8 +377,8 @@ static void printCommandLine(PrintStream out) {
     out.println();
     out.println("--export             Export an application.");
     out.println("--no-java            Do not embed Java. Use at your own risk!");
-//    out.println("--platform           Specify the platform (export to application only).");
-//    out.println("                     Should be one of 'windows', 'macosx', or 'linux'.");
+    out.println("--platform           Specify the platform (export to application only).");
+    out.println("                     Should be one of 'windows', 'macosx', or 'linux'.");
 //    out.println("--bits               Must be specified if libraries are used that are");
 //    out.println("                     32- or 64-bit specific such as the OpenGL library.");
 //    out.println("                     Otherwise specify 0 or leave it out.");
