2003/11/19 02:38:49

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ee19ec..0833887 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,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 +193,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 +209,10 @@ 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 
+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 +226,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 +331,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`