X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=27286c93e0ad08c4189d69fce3a82c16309dae57;hb=0875e1f0271b4d43c84e61384b1959902e9516ba;hp=da3ca8da38c3954595d6ca7b83b61ad39b3a4a1b;hpb=8d8b2d3288652dc6efcb4f62915614f6fdb11668;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index da3ca8d..27286c9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 #
 
-all:      JVM Linux Win32 Darwin Solaris
+all:      JVM Linux Win32 Darwin #Solaris
 
 clean:
 	rm -rf .jikes .configure* .install* build .compile .build*
@@ -140,7 +140,10 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 #
 
 builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips
+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
+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/%=%)
 
@@ -311,3 +314,9 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
+
+
+# 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 .
+
+