2003/09/20 02:18:34

darcs-hash:20040130073559-2ba56-1e01805f85439ed181d97dfa5b5ddbe6bdefb078.gz

diff --git a/Makefile b/Makefile
index 9cd4a8b..84c8b24 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@ build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(
 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/%.java: src/%.java.pp
        make build/class/org/xwt/util/Preprocessor.class
@@ -130,45 +131,30 @@ $(target_bin): build/$(platform)/$(platform).ar upstream/jpeg-6b/build-$(target)
 # Special treatment:
 #
 
-build/xwar/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
-       @echo -e "\n\033[1mzipping                * -> .xwar: builtin.xwar\033[0m"
-       mkdir -p build/xwar
-       cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
+builtin_src := $(find src/org/xwt/builtin)
+build/res/resources.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips
+       @echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+       cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
-build/$(platform)/org/xwt/builtin.res.o: build/xwar/builtin.xwar
-       @echo -e "\n\033[1mwrapping           .xwar -> .o: builtin.res.o\033[0m"
-       @(echo "unsigned int builtin_xwar_length = ";                           \
-               (wc -c build/xwar/builtin.xwar | sed "s_build.*__");            \
+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_xwar[] = {";                        \
-               hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar;         \
+               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)/org/xwt/builtin.res.o
-
-build/$(platform)/freetype.res.o: build/mips/freetype.mips
-       @echo -e "\n\033[1mwrapping           .mips -> .o: freetype.res.o\033[0m"
-       @(echo "unsigned int freetype_mips_length = ";                           \
-               (wc -c build/mips/freetype.mips | sed "s_build.*__");            \
-               echo \;;                                                         \
-               echo "unsigned char freetype_mips[] = {";                        \
-               hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips;         \
-               echo "};") > .freetype.c
-       $(gcc) -c .freetype.c -o build/$(platform)/freetype.res.o
-
+       $(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: .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/xwar/builtin.xwar build/mips/freetype.mips
+build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class)
        @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 -fs ../../../xwar/builtin.xwar  # HACK
-       cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips         # HACK
        cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
-       rm build/class/org/xwt/builtin.xwar
-       rm build/class/org/xwt/freetype.mips
 
 
 
@@ -182,7 +168,7 @@ build/mips/%.c.o: src/%.c
        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 $@ $<
 
-build/mips/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
+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
        @echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
        mkdir -p build/mips