make Dominic and other Windows-users happy
authoradam <adam@megacz.com>
Mon, 26 Feb 2007 21:17:47 +0000 (22:17 +0100)
committeradam <adam@megacz.com>
Mon, 26 Feb 2007 21:17:47 +0000 (22:17 +0100)
Makefile

index 6481e68..0b6239b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,12 @@ java              = java -Xmx500m
 
 run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
+ifeq ($(shell uname -o),Cygwin)
+ps=\;
+else
+ps=:
+endif
+
 fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g
        mkdir -p build/class/edu/berkeley/fleet/assembler/
        cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
@@ -14,7 +20,7 @@ fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src
        for A in `find ships -name \*.ship`;\
          do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
          done
-       javac -classpath build/class:lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+       javac -classpath build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
        cd build/class/; jar cmf manifest ../../$@ .