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

diff --git a/Makefile b/Makefile
index 422e050..ea56dea 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ clean:
 	find upstream -name config.cache -exec rm {} \;
 
 JVM:        build/JVM/xwt.jar
-Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
+Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
@@ -46,33 +46,44 @@ 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  += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name '*.java.pp'))
+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))
 
-# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?)
-build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
-build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
-build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
-	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
-build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+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/%.java: src/%.java.pp
+build/java/org/xwt/%.java: src/org/xwt/%.java
 	make build/class/org/xwt/util/Preprocessor.class
-	@echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`
-	rm -f $@
-	java -cp build/class org.xwt.util.Preprocessor < $< > $@
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
 
-build/class/%.class: build/java/%.java .jikes
+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'`/$< $@
+build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
+	@echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class
+	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"
@@ -139,8 +150,12 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 # Special treatment:
 #
 
-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
+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
+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/%=%)
 
@@ -175,7 +190,10 @@ build/mips/%.c.o: src/%.c
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
-	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $<
+	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
+		-Iupstream/freetype-2.1.4/src/include  \
+		-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
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
@@ -189,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: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
-	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@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 \
 
 
 
@@ -311,3 +331,10 @@ 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 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/ -name \*.java`