2003/11/16 09:03:16

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 4392101..ea56dea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,16 +46,24 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
+all_java_sources  := $(filter-out build/java/org/xwt/mips/%, $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java')))
+all_java_sources  += build/java/org/xwt/translators/FreetypeVM.java
 
 java_sources      := $(all_java_sources)
 nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
 plat_java_sources      := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
 
+build/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class
+       mkdir -p build/java/org/xwt/translators
+       (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
+        java -Xint -cp build/class org.xwt.mips.Compiler FreetypeVM build/res/freetype.mips)\
+        > $@
+
 build/java/org/xwt/%.java: src/org/xwt/%.java
        make build/class/org/xwt/util/Preprocessor.class
        @echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
        mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
@@ -68,7 +76,14 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java
        mkdir -p build/class/org/xwt/util/
        ./.jikes $<
 
+build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.* .jikes
+       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+       mkdir -p build/class/org/xwt/mips/
+       ./.jikes $<
+
+
 # this forces a clean build every time because jikes is so damn buggy
+preprocess: $(all_java_sources)
 compile: .compile
 .compile: $(all_java_sources) .jikes
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
@@ -135,7 +150,7 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 # Special treatment:
 #
 
-builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+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
@@ -177,7 +192,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
@@ -192,25 +207,27 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
                -Lbuild/mips \
                -Lupstream/freetype-2.1.4/src/objs \
                -o $@ \
-               build/mips/org/xwt/translators/Freetype.c.o \
-               --strip \
-               -lfreetype
+               $^ \
+               -lfreetype \
+#              -Wl,-s \
 
 .install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
-build/res/libmspack.mips: .install_libmspack-20030726 build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+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
+       make .install_libmspack-20030726 
        upstream/install/bin/mips-unknown-elf-gcc \
                -nostdlib \
                --static \
                -march=mips1 \
                -T src/org/xwt/mips/linker.ld \
                -Lbuild/mips \
-               -Lupstream/libmspack-20030726/build-mips-unknown-elf/ \
+               -Lupstream/libmspack-20030726/src/mspack \
+               -Lupstream/libmspack-20030726/build-mips-unknown-elf \
                -o $@ \
-               build/mips/org/xwt/translators/MSPack.c.o \
-               --strip \
-               -lmspack
+               $^ \
+               -lmspack \
+#              -Wl,-s \
 
 
 
@@ -320,4 +337,4 @@ dist-private:
 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: ; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`