fixed default args operation

ianopolous · Feb 22, 2015 · 24e91cd · 24e91cd
1 parent 7b77e86
commit 24e91cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -102,14 +102,7 @@ application: fast
 	jar -i JPCApplication.jar
 
 .PHONY: release
-release: 
-	mkdir -p build
-	javac $(JAVA_RELEASE_OPTS) -d build `find org/jpc/emulator -name \*.java` \
-	    `find org/jpc/support -name \*.java` \
-	    `find org/jpc/debugger -name \*.java` \
-	    `find org/jpc/classfile -name \*.java` \
-	    `find org/jpc/debugger -name \*.java` \
-	    `find org/jpc/j2se -name \*.java`
+release: build_core
 	echo "Name: JPC Application" > jpc.manifest
 	echo "Author: Ian Preston" >> jpc.manifest
 	echo "Main-Class: org.jpc.j2se.JPCApplication" >> jpc.manifest

diff --git a/src/org/jpc/j2se/JPCApplication.java b/src/org/jpc/j2se/JPCApplication.java
@@ -692,7 +692,7 @@ public static void main(String[] args) throws Exception
             System.exit(0);
         }
 
-        if ((args.length == 0) && (!Option.boot.isSet() && !Option.hda.isSet() && Option.cdrom.isSet() && Option.fda.isSet()))
+        if ((args.length == 0) && (!Option.boot.isSet() && !Option.hda.isSet() && !Option.cdrom.isSet() && !Option.fda.isSet()))
         {
             ClassLoader cl = JPCApplication.class.getClassLoader();
             if (cl instanceof URLClassLoader)