X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=ea56deadeb017c654eb8227c84e129d3310b6e43;hb=ff3815a13aa6a57852f28c789f8a8d22f2a1f26e;hp=a46198109061d9c41c7efec6b784adbfbd537f92;hpb=04739ad4085fdc3989ceaebc890649d1568063a2;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index a461981..ea56dea 100644
--- 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,6 +76,12 @@ 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
@@ -136,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
@@ -193,14 +207,15 @@ 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 \
@@ -210,9 +225,9 @@ build/res/libmspack.mips: .install_libmspack-20030726 build/mips/org/xwt/transla
 		-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 \