2003/08/09 23:43:23

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index f79a9d0..593bb6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,12 @@ xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/built
 cc_sources             := src/org/xwt/plat/$(platform).cc
 c_sources              := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
 
+# freetype inputs
+freetype_base_sources  := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c
+freetype_other_sources := smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c
+freetype_sources       := $(freetype_base_sources:%=gcc/src/freetype-2.1.4/src/base/%)
+freetype_sources       += $(freetype_other_sources:%=gcc/src/freetype-2.1.4/src/%)
+
 # outputs
 java_objects           := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
 java_objects           += bin-$(platform)/org/xwt/plat/GCJ.java.o
@@ -56,17 +62,20 @@ ifneq ($(verbose),true)
 silent := --silent
 endif
 
-compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
+
+# preprocessing: use m4 -P
+
+compile: .javac bin/org/xwt/builtin.xwar
        echo "compiling   .java -> .class:"
        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
                grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2 Solaris
+all: Win32 Linux Java2 #Solaris
 
 .javac:
-       if \
+       @if \
                type jikes && (jikes --version | grep "Version 1.18"); \
        then \
                echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
@@ -79,7 +88,7 @@ all: Win32 Linux Java2 Solaris
        else \
                echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
                echo javac > .javac; \
-       fi \
+       fi
 
 jikes:
        curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
@@ -137,6 +146,25 @@ propose-patch:
 $(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
        make -C gcc
 
+gcc/src/.freetype:
+       mkdir -p gcc/src
+       curl http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz | tar xvzf - -C gcc/src
+       cd gcc/src; patch -p0 < freetype.patch
+       touch gcc/src/.freetype
+
+freetype.mips: gcc/src/.freetype
+       make -C gcc mips target=mips
+       $(gcc_path)/bin/mips-gcc \
+               --static \
+               -march=r3000 \
+               -o freetype.mips \
+               -I gcc/src/freetype-2.1.4/include \
+               $(freetype_sources) \
+               -Wl,--warn-once \
+               src/org/xwt/imp/Freetype.c \
+               $(gcc_path)/mips/lib/libc.a \
+               -Wl,-T,$(gcc_path)/mips/lib/nullmon.ld
+
 # compile is here to force compilation of the .class files (they get used via -Ibin/) 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)
@@ -215,7 +243,7 @@ Win32:
                platform=Win32 \
                target=i686-pc-mingw32 \
                target_bin=xwt.exe \
-               platform_link="-Wl,--subsystem,console -lcomdlg32" \
+               platform_link="-Wl,--subsystem,windows -lcomdlg32" \
                platform_java_sources="Win32"
 
 Darwin: