X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8e8e05b6b2ba28fc5b232fc64d67e3d7ad5af02f;hb=4e2267ecd1a414ca53c2471a741cb4d5a99755ca;hp=cd0e3d03b3185d71989ac39f3b6679f8b775d9e9;hpb=f9979db870c3a54dd7a2080cb45270c23eb157dd;p=fleet.git

diff --git a/Makefile b/Makefile
index cd0e3d0..8e8e05b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.jar: $(java_files) $(ship_files) 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/
-	javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
 	cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+	cd build/class/; jar xf ../../lib/ibex.jar
 	for A in `find ships -name \*.ship`;\
 	  do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
 	  done
-	javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar: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
 	jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -35,8 +36,8 @@ host = intel2950-5.eecs.berkeley.edu
 # 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
 #host = amdr905-1.eecs.berkeley.edu
 
-#remote_ise = /tools/xilinx/10.1/ISE
-#remote_edk = /tools/xilinx/10.1/EDK
+remote_ise = /tools/xilinx/10.1/ISE
+remote_edk = /tools/xilinx/10.1/EDK
 
 #remote_ise = /tools/xilinx/ISE9.1i_lin
 #remote_edk = /tools/xilinx/EDK9.1i
@@ -45,8 +46,8 @@ host = intel2950-5.eecs.berkeley.edu
 #remote_dir = /tmp/megacz/fleet/
 
 remote_dir = /scratch/megacz/fleet/
-remote_ise = /scratch/megacz/xilinx/10.1/ISE
-remote_edk = /scratch/megacz/xilinx/10.1/EDK
+#remote_ise = /scratch/megacz/xilinx/10.1/ISE
+#remote_edk = /scratch/megacz/xilinx/10.1/EDK
 
 #host = mm2.millennium.berkeley.edu
 #remote_ise = /scratch/megacz/xilinx/ise/
@@ -211,7 +212,6 @@ synth:
 	  | grep --line-buffered -v 'been backward balanced into' \
 	  | grep --line-buffered -v 'IDDR has been replaced by IDDR_2CLK' \
 	  | grep --line-buffered -v 'WARNING:Xst:616 - Invalid property'
-	#rm build/fpga/dvi.ucf
 	cat build/fpga/*.ucf > build/fpga/main.ucf
 	$(xilinx_ise)ngdbuild ${intstyle} -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
 	$(xilinx_ise)map      ${intstyle} -ol ${effort} -p $(device) -pr b -cm ${opt_for} -o main_map.ncd main.ngd main.pcf