2003/09/04 02:26:45

darcs-hash:20040130070435-2ba56-e92fd965635e09e372ee7e2ce0555bc3410c1549.gz

diff --git a/Makefile b/Makefile
index 30ba19c..203cdd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ all:                   JVM Linux Win32 Java2 #Solaris
 #
 target_bin             := xwt.$(shell echo $(target) | tr A-Z a-z)
 jikes_flags            := -verbose -nowarn -sourcepath src/
-gcc_path               := upstream/gcc-3.3/install
+gcc_path               := upstream/install
 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)
@@ -57,8 +57,8 @@ jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/src/%.c)
 $(jpeg_sources):
        make -C upstream jpeg-6b/.installed
 
-freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/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/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
+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 -C upstream freetype-2.1.4/.installed
 
@@ -75,6 +75,7 @@ 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
 build/java/%.java: src/%.java
+       mkdir -p `dirname $@`;                  \
        cd `dirname $@`;                        \
        A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
        B=`dirname $$A`;                        \
@@ -84,8 +85,8 @@ build/java/%.java: src/%.java
 
 # PHASE 3: class files
 class_files           := $(java_sources:build/java/%.java=build/class/%.class)
-class_files           += build/class/org/xwt/imp/Freetype.class
-$(class_files): build/class/%.class: build/java/%.java src/%.java upstream/.jikes mkdir_build
+class_files           += build/class/org/xwt/imp/Freetype.class build/class/org/xwt/imp/MIPS.class
+$(class_files): build/class/%.class: build/java/%.java src/%.java upstream/.jikes
        @$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $< -d build/ 2>&1 | \
                grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
 
@@ -150,18 +151,21 @@ build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/class/org/x
        @java -cp build org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
 
 build/mips/freetype.mips:
-       make -C upstream gcc-3.3-mips freetype-2.1.4/src target=mips
+       mkdir -p build/mips
+       make -C 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 gcc/src/freetype-2.1.4/include \
+               -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,-T,$(gcc_path)/mips/lib/nullmon.ld
+               -Wl,-s