update Main.java demo to no longer avoid wierdiness

[anneal.git] / Makefile

diff --git a/Makefile b/Makefile
index 0d6f0c7..07e2866 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,20 @@
+jars = lib/kd.jar:lib/trove-0.1.8.jar:lib/sil-0.43b-am1.jar:lib/jogl/jogl.jar:lib/jogl/gluegen-rt.jar
 all:
        mkdir -p build
-       javac -d build `find src -name \*.java`
-       java -cp build Main
+       cp sample-stl/*.stl build
+       javac -cp $(jars) -d build `find src -name \*.java`
+       nice -n 19 java -Xmx1200m -Djava.library.path=lib/jogl -cp $(jars):build edu.berkeley.qfat.Main
+
+run:
+       /cygdrive/c/Program\ Files/Java/jre*/bin/java -Xmx1200m -Djava.library.path=lib/jogl -cp build\;lib/kd.jar\;lib/trove-0.1.8.jar\;lib/sil-0.43b-am1.jar\;lib/jogl/jogl.jar\;lib/jogl/gluegen-rt.jar\;build edu.berkeley.qfat.Main
+
+
+dist:
+       javac -cp $(jars) -d build `find src -name \*.java`
+       rm -f space-sculptor.jar
+       cd build; for A in ../lib/*.jar ../lib/jogl/*.jar; do jar xvf $$A; done
+       cp lib/jogl/* build
+       echo 'Main-Class: edu.berkeley.qfat.Boot' > build/manifest
+       cp *.stl build
+       cd build; jar cvmf manifest ../space-sculptor.jar .
+