X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=63f32a3db6e5051dcdf0ed5bf1ae4606cb0f2163;hp=cd73b3eecc2526fd50ea4f3e8b9840634a7faa59;hb=574af437a07d0e80428923a4004f3d7c1b1be7e2;hpb=580248abbbcfcbf7a7c28cc2a00a97c305ef99ad

diff --git a/Makefile b/Makefile
index cd73b3e..63f32a3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@
 all:      JVM Linux Win32 Darwin Solaris
 
 clean:
-	rm -rf .jikes .configure* .install* build .compile
-	find upstream -name config.cache -exec rm {}\;
+	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"
@@ -140,7 +140,7 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 #
 
 builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
@@ -156,7 +156,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 
 # 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: .vendor .install_gcc-3.3_$(target) $(target_bin)
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
 
 build/JVM/xwt.jar: .compile build/res/builtin.jar
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
@@ -193,6 +193,22 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
 		--strip \
 		-lfreetype
 
+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
+	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/ \
+		-o $@ \
+		build/mips/org/xwt/translators/MSPack.c.o \
+		--strip \
+		-lmspack
+