From b7f7356785eebcdfb1a818b4ea169a9a94620055 Mon Sep 17 00:00:00 2001
From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:04:12 +0000
Subject: [PATCH] 2003/07/31 22:01:28

darcs-hash:20040130070412-2ba56-464407e8cd25f56a423f25232ba73c085b901357.gz
---
 Makefile |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 2387ed2..2c03a43 100644
--- 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
@@ -66,20 +72,20 @@ compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
 all: Win32 Linux Java2 #Solaris
 
 .javac:
-	if \
-		type jikes && (jikes --version | grep "Version 1.18"); \
-	then \
-		echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
-		echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
-		javac GetBootClassPath.java; \
-		java -cp . GetBootClassPath > .bootclasspath; \
-		rm GetBootClassPath.*; \
-		echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
-		cat .bootclasspath >> .javac; \
-	else \
-		echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
-		echo javac > .javac; \
-	fi \
+	@if \
+	@	type jikes && (jikes --version | grep "Version 1.18"); \
+	@then \
+	@	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
+	@	echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
+	@	javac GetBootClassPath.java; \
+	@	java -cp . GetBootClassPath > .bootclasspath; \
+	@	rm GetBootClassPath.*; \
+	@	echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+	@	cat .bootclasspath >> .javac; \
+	@else \
+	@	echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
+	@	echo javac > .javac; \
+	@fi
 
 jikes:
 	curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
@@ -137,6 +143,23 @@ 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 -v \
+		--static \
+		-o freetype.mips \
+		-I gcc/src/freetype-2.1.4/include \
+		$(freetype_sources) \
+		src/org/xwt/imp/Freetype.c \
+		$(gcc_path)/mips/lib/libc.a $(gcc_path)/mips/lib/libnosys.a \
+		-Wl,-T,$(gcc_path)/mips/lib/cfe.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)
-- 
1.7.10.4