2003/09/28 00:43:29

darcs-hash:20040130073829-2ba56-d83290316a87486eb9f6469d68de611c218397e5.gz

diff --git a/Makefile b/Makefile
index cd73b3e..ae99cf4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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/%=%)
 
@@ -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
+
 
 
 

diff --git a/Makefile.upstream b/Makefile.upstream
index 7cc4917..620411c 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -15,6 +15,7 @@ url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/fre
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
+url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
        rm -rf upstream/darwin-linker/src
@@ -83,6 +84,12 @@ environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/
 environment_jpeg-6b_$(target)           += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
 environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
 
+# libmspack configury doesn't obey --target
+environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
+environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
+environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
+environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+
 environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
@@ -117,6 +124,11 @@ vendor: .vendor; @true
                $(configure_$*_$(target))
        touch $@
 
+.install_libmspack-20030726_$(target): .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
+.configure_libmspack-20030726_$(target): .download_libmspack-20030726
+       mkdir -p upstream/libmspack-20030726/build-$(target)
+       cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
+
 .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
        cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
        upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a