X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8cd4135a15347fefc4635291c4814904244120c7;hb=2c0ae10e1f1d99d1661b798e479d2d4e68f523d2;hp=4ee19ecbb85f33817c94f6e8537a35334a0e07fa;hpb=6f2339751a675c8bc42a9a496d3032ea70cc0e55;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 4ee19ec..8cd4135 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@
 all:      JVM Linux Win32 Darwin #Solaris
 
 clean:
+	rm -rf build
+
+dist-clean:
 	rm -rf .jikes .configure* .install* build .compile .build*
 	find upstream -name config.cache -exec rm {} \;
 
@@ -154,7 +157,8 @@ builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
 	mkdir -p build/res/fonts/vera
 	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
-	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraBd.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
@@ -192,7 +196,7 @@ build/mips/%.c.o: src/%.c
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
 	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
 		-Iupstream/freetype-2.1.4/src/include  \
-		-Iupstream/libmspack-20030726/libmspack/mspack \
+		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
 build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
@@ -208,11 +212,11 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
 		-Lupstream/freetype-2.1.4/src/objs \
 		-o $@ \
 		$^ \
-		-lfreetype \
-#		-Wl,-s \
+		-lfreetype
 
-.install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
-build/mips/org/xwt/translators/MSPack.c.o: .install_libmspack-20030726 
+.install_libmspack-20030726:
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf && touch .install_libmspack-20030726
+build/mips/org/xwt/translators/MSPack.c.o: .install_libmspack-20030726
 build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips build/res
@@ -226,10 +230,7 @@ build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/o
 		-Lupstream/libmspack-20030726/build-mips-unknown-elf \
 		-o $@ \
 		$^ \
-		-lmspack \
-#		-Wl,-s \
-
-
+		-lmspack
 
 
 ##############################################################################
@@ -334,7 +335,7 @@ dist-private:
 
 
 # this is for Adam; don't mess with it
-test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
 oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`