X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=26ec8c3ac6c4b05d25091dbf128e35254e65a965;hb=4963611978625d087561f5a669a0ba93a04bd1ba;hp=63f32a3db6e5051dcdf0ed5bf1ae4606cb0f2163;hpb=574af437a07d0e80428923a4004f3d7c1b1be7e2;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 63f32a3..26ec8c3 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,9 @@ $(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 + cd build/res/fonts; ln -s ../../../upstream/vera-1.10/ttf-bitstream-vera-1.10 vera +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/%=%) @@ -262,7 +264,7 @@ dist: compile echo "* This build is $(current_build)" echo "***********************************************************" - ifeq ($(shell uname -n),serverbeach.megacz.com) + ifeq ($(shell uname -n),megacz.com) (make $(silent) dist-private 2>&1) >> .make-dist.out || \ (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false) tail -n 200 .make-dist.out | \