X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b4d2979c5dea5abd2d8f5119cdc8d28282fcb09c;hb=6648a20efb79368af2fb16d1694afa685c04a0fc;hp=46ad4fcd0254c9237a6ace43d9adda1abf37ccd9;hpb=4b65dcd32ab47211c1bd7eb82e762d763b4238de;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 46ad4fc..b4d2979 100644
--- a/Makefile
+++ b/Makefile
@@ -1,228 +1,234 @@
 #############################################################################
 #
 # The XWT Makefile
+
 #
 
-all:                   JVM Linux Win32 Java2 #Solaris
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
+all:      JVM Linux Win32 Darwin #Solaris
+
+clean:
+	rm -rf build
+
+dist-clean:
+	rm -rf .jikes .configure* .install* build .compile .build*
+	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"
+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,console -lcomdlg32" target_bin=xwt.exe
+Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
+
+# default
+platform            := JVM
+
+darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
+darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
+darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:$(darwin_libdir)/libGL.dylib
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib:$(darwin_libdir)/libGLU.dylib
+darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
 
 #############################################################################
 # Configurables:
 #
 target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
-jikes_flags            := -verbose -nowarn -sourcepath src/
-gcc_path               := upstream/install
+jikes_flags            := -nowarn -sourcepath src/
 gcc_optimizations      := -O2
-#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-gcc_flags              := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/
-gcj_flags              += -fCLASSPATH=build/java
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
-g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-
-gcjh                   := $(gcc_path)/bin/gcjh
-as                     := $(gcc_path)/$(target)/bin/as
-ar                     := $(gcc_path)/$(target)/bin/ar
-ranlib                 := $(gcc_path)/$(target)/bin/ranlib
-strip                  := $(gcc_path)/$(target)/bin/strip
+#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
+#gcc_optimizations      += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+gcc_flags              := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)/
+gcj_flags              := -fCLASSPATH=build/java
+gcj                    := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcjh                   := $(shell test -e `pwd`/upstream/install/bin/$(target)-gcjh && echo `pwd`/upstream/install/bin/$(target)-gcjh || echo `pwd`/upstream/install/bin/gcjh)
+g++                    := upstream/install/bin/$(target)-gcj $(gcc_flags)
+gcc                    := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-
-
-#############################################################################
-# Overview:
-# 
-# The Makefile has been divided into phases; each phase depends on the
-# previous one.  Subphases of the same phase (ie 1a, 1b) are not
-# interdependent.  You can think of the build process as proceeding
-# through the phases in order, but processing subphases within a given
-# phase in any order.
-#
-
-
-# PHASE 1a: upstream code
-jpeg_c_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
-jpeg_c_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
-jpeg_c_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
-jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/src/%.c)
-$(jpeg_sources):
-	make -sC upstream jpeg-6b/src
-
-freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/src/src/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c)
-freetype_sources    += $(patsubst %,upstream/freetype-2.1.4/src/src/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
-$(freetype_sources):
-	make -sC upstream freetype-2.1.4/.installed
-
-upstream/.jikes:
-	make -sC upstream .jikes
-
-$(gcc_path)/bin/$(target)-gcj:
-	make -sC upstream gcc-3.3-$(target)
-
-
-# PHASE 1b: human-written inputs
-handwritten_java_sources      := $(shell find src -name \*.java)
-handwritten_java_pp_sources   := $(shell find src -name \*.java.pp)
-handwritten_mips_sources      := $(shell find src -name \*.mips.c)
-handwritten_cc_sources        := src/org/xwt/plat/$(platform).cc
-handwritten_c_sources         := $(jpeg_sources)
-handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-
-
-# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
-java_sources    := $(handwritten_java_sources:src/%.java=build/java/%.java)
-java_sources    += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
-java_sources    += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
-java_sources    += build/java/org/xwt/Builtin.java
-#java_sources    += build/java/org/xwt/imp/Freetype.java
-$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
-	@echo "symlinking:                         $@"
-	@mkdir -p `dirname $@`;  \
-	cd `dirname $@`;                        \
-	A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
-	B=`dirname $$A`;                        \
-	C=$$B/$<;                               \
-	ln -s $$C
-
-
-# PHASE 3: class files
-class_files           := $(java_sources:build/java/%.java=build/class/%.class)
-$(class_files): build/class/%.class: build/java/%.java upstream/.jikes
-	@echo "compiling          .java -> .class: $<"
-	@mkdir -p build/class
-	@upstream/.jikes $<
-
+include Makefile.upstream
+
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
+all_java_sources  := $(java_sources)
+
+nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java 
+plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
+
+build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
+	make build/class/org/xwt/mips/Compiler.class
+	mkdir -p build/java/org/xwt/translators
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
+	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
+	 java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
+	 | sed 's,//.*$$,,;'|tr -d '\n'  > $@
+
+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'`/$< $@
+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/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/translators
+	./.jikes -g:none $<
+
+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/org/xwt/util/
+	./.jikes $<
+
+build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java
+	make .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: $(java_sources)
 compile: .compile
-.compile: $(java_sources)
-	@echo "compiling          .java -> .class: src/**/*.java"
-	@mkdir -p build/class
-	@upstream/.jikes $(java_sources)
-	@touch .compile
+.compile: build/class/org/xwt/translators/MIPSApps.class $(java_sources) .jikes 
+	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
+	mkdir -p build/class
+	@./.jikes $(java_sources)
+	touch .compile
 
 # PHASE 4: gcj-generated headers
-java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
-$(java_headers): build/h/%.h: build/class/%.class .compile
-	@echo "extracting        .class -> .h:     $<"
-	@mkdir -p `dirname $@`
-	@ls `echo $< | sed s/.class\$$//`*.class |\
-		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcjh) -d ../h --classpath .)
-
-# PHASE 4: object files
-java_object_files          := $(filter-out build/$(platform)/org/xwt/plat/%,$(java_sources:build/java/%=build/$(platform)/%.o))
-java_object_files          += $(patsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources))
-cc_object_files            := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o)
-c_object_files             := $(handwritten_c_sources:upstream/jpeg-6b/src/%.c=build/$(platform)/jpeg-6b/%.c.o)
-$(java_object_files): build/$(platform)/%.java.o: build/java/%.java
-	@echo "compiling          .java -> .o:     $<"
-	@mkdir -p `dirname $@`
-	@$(gcj) -c $< -o $@
-$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers)
-	@echo "compiling            .cc -> .o:     $<"
-	@mkdir -p `dirname $@`
-	@$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
-$(c_object_files): build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
-	@echo "compiling             .c -> .o:     $<"
-	@mkdir -p `dirname $@`
-	@$(gcc) -Ibuild/h -c $< -o $@
+java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
+build/h/%.h: build/class/%.class
+	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
+	mkdir -p `dirname $@`
+	ls `echo $< | sed s/.class\$$//`*.class |\
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
+
+# a hack since we've disabled gcj's awt implementation
+build/$(platform)/org/xwt/plat/Java2.java.o:
+	touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
+	$(gcj) -c $< -o $@
+build/$(platform)/org/xwt/plat/AWT.java.o:
+	touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+
+build/$(platform)/%.java.o: build/java/%.java
+	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(gcj) -c $< -o $@
+
+headers: $(java_headers)
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+	@make headers
+	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/  -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+	@echo -e "\n\033[1mcompiling             .c -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin): $(java_object_files) $(cc_object_files) $(c_object_files)
-	@echo "linking               .o -> $(target_bin)"
-	@mkdir -p build/$(platform)
-	@$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
+# FIXME use libjpeg
+jpeg_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 
+upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 
-##############################################################################
-# Special treatment:
-#
-
-build/java/org/xwt/Builtin.java:: $(handwritten_xwar_sources)
-	@mkdir -p `dirname $@` build build/java build/class build/h build
-	@echo "zipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java"
-	@echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
-	@echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
-	@echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
-	@cd src; $(jar) cf - $(handwritten_xwar_sources:src/%=%) | \
-		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
-		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
-	@echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
-
-postprocessed_sources   := $(handwritten_java_pp_sources:src/%.pp=build/java/%)
-$(postprocessed_sources):  build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
-	@echo "preprocessing   .java.pp -> .java:  $<"
-	@mkdir -p `dirname $@`
-	@rm -f $@
-	@java -cp build/class org.xwt.util.Preprocessor < $< > $@
-
-build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
-	@echo "translating        .mips -> .java:  $@"
-	@mkdir -p build/java/org/xwt/imp/
-	@rm -f $@
-	@java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
-
-build/mips/freetype.mips: $(freetype_mips_objects)
-	@echo "compiling             .c -> .mips:  $@"
-	@mkdir -p build/mips
-	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
-	@$(gcc_path)/bin/mips-gcc \
-		--static \
-		-mabi=32 \
-		-mips1 \
-		-msoft-float \
-		-o $@ \
-		-I upstream/freetype-2.1.4/src/include \
-		$(freetype_sources) \
-		-mno-crt0 \
-		-Tnullmon.ld \
-		-Wl,--warn-once \
-		src/org/xwt/imp/Freetype.c \
-		-Wl,-s
+build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
+	mkdir -p build/$(platform)
+	rm -f $@
+	upstream/install/$(target)/bin/ar rc $@ $^
+	upstream/install/$(target)/bin/ranlib $@
 
+$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
+	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
+	mkdir -p build/$(platform)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
 
 
 ##############################################################################
-# Supported Platforms:
+# Special treatment:
 #
 
+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/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/fonts/vera
+	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+
+build/$(platform)/builtin.o: build/res/builtin.jar
+	@echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
+	@(echo "unsigned int builtin_length = ";                                \
+		(wc -c build/res/builtin.jar | sed "s_build.*__");              \
+		echo \;;                                                        \
+		echo "unsigned char builtin_bytes[] = {";                       \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar;           \
+		echo "};") > .builtin.c
+	$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
+
 # compile is here to force compilation of the .class files (they get used via -Ibuild) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
-	@echo -e "\\n=== $(target) ========================================="
-
-Linux:
-	@make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11"
-
-Solaris:
-	@make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11"
-
-Win32:
-	@make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
-
-Carbon:
-	@make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration" platform_java_sources="POSIX Carbon OpenGL"
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
 
-JVM: build/JVM/xwt.jar
-build/JVM/xwt.jar:.compile
-	@echo "archiving         .class -> .jar:   build/JVM/xwt.jar"
-	@mkdir -p build/JVM
-	@echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-	@cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
-		`find . -name \*.class | grep -v org/xwt/plat/` \
-		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
-	@echo
+build/JVM/xwt.jar: .compile build/res/builtin.jar
+	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
+	mkdir -p build/JVM
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+		`find . \! -type d \! -path './org/xwt/mips/*'` \
+		$(patsubst %,org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
 
 
 ##############################################################################
-# Misc
+# Freetype
 #
 
-clean:
-	find . -name \*~ | xargs rm -f
-	find . -name \#\*\# | xargs rm -f
-
-
+build/mips/%.c.o: src/%.c .download_libmspack-20030726
+	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+	make .install_libmspack-20030726_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 \
+		-Iupstream/freetype-2.1.4/src/include  \
+		-Iupstream/libmspack-20030726/src/mspack \
+		-c -o $@ $<
+
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.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
+	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
+	upstream/install/bin/mips-unknown-elf-gcc \
+		-nostdlib \
+		--static \
+		-march=mips1 \
+		-T src/org/xwt/mips/linker.ld \
+		-Lbuild/mips \
+		-Lupstream/freetype-2.1.4/src/objs \
+		-Lupstream//libmspack-20030726/build-mips-unknown-elf/ \
+		-o $@ \
+		$^ \
+		-lfreetype \
+		-lmspack \
+		-Wl,--gc-sections
 
 ##############################################################################
 # Maintainer stuff: generating numbered builds, proposing patches
@@ -270,33 +276,27 @@ this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $
 
 # pre-depend on compile as a sanity check
 dist: compile
-	# this will fail if we haven't checked-in since the comment is null; we want this.
-	cvs commit -m '' > /dev/null
-	cvs tag -F xwt-$(current_build)
-
 	echo "***********************************************************"
 	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 | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		# this will fail if we haven't checked-in since the comment is null; we want this.
+		cvs commit -m '' > /dev/null
+		cvs tag -F xwt-$(current_build)
+
+#		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 dist-private:
 	make $(silent) update-build
 
-	# preserve gcc across builds so we don't have to remake it
-	mkdir -p $(HOME)/dist.xwt.org-gcc
-	mv gcc gcc-
-	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/*.patch gcc/
-
 	# build it
 	nice -n 19 make all
 
@@ -304,13 +304,23 @@ dist-private:
 	echo === master.dist.xwt.org ==================================
 
 	echo "copying xwt.jar to distribution area..."
-	cp xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+	cp build/JVM/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
 	echo "stripping xwt.exe and copying it to the distribution area..."
-	$(strip) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+	upstream/install/i686-pc-mingw32/bin/strip build/Win32/xwt.exe \
+		-o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
 	echo "copying xwt.linux to distribution area..."
-	$(strip) build/Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+	upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
+		-o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+#	echo "copying xwt.solaris to distribution area..."
+#	upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+#		-o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+
+	echo "copying xwt.darwin to distribution area..."
+	upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
+		-o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.unsigned
 
 	echo "creating source tarball in distribution area..."
 	CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
@@ -321,18 +331,8 @@ dist-private:
 	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
 
-
-
-
-
-#mips: $(prefix)/mips/lib/libm.a
-#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc
-#	mkdir -p build/$(target)/newlib
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \
-#		../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make
-#	cd build/$(target)/newlib; make install
-# FIXME: this is probably going to cause problems... figure out how to get by without it
-#	touch .empty.c
-#	$(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`