From ce833e3c1a159dd84cb5f7c3548248a09f63590a Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:04:41 +0000 Subject: [PATCH] 2003/09/04 08:28:16 darcs-hash:20040130070441-2ba56-b53e7a19f9efe17d05944f22775c8a4ab32bf225.gz --- Makefile | 6 +++--- src/org/xwt/Main.java | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 239f18e..444515b 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ upstream/.jikes: make -sC upstream .jikes $(gcc_path)/bin/$(target)-gcj: - make -sC upstream gcc-3.3-$(target) + make -sC upstream gcc-3.3.1-$(target) # PHASE 1b: human-written inputs @@ -75,7 +75,7 @@ java_sources := $(handwritten_java_sources:src/%.java=build/java/%.java) 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 -#java_sources += build/java/org/xwt/imp/Freetype.java +java_sources += build/java/org/xwt/imp/Freetype.java $(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java @echo "symlinking: $@" @mkdir -p `dirname $@`; \ @@ -164,7 +164,7 @@ build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/ build/mips/freetype.mips: $(freetype_mips_objects) @echo "compiling .c -> .mips: $@" @mkdir -p build/mips - @make -sC 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 + @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3.1-mips freetype-2.1.4/src .headers target=mips @$(gcc_path)/bin/mips-gcc \ --static \ -mabi=32 \ diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java index 92d0b77..c61bcf1 100644 --- a/src/org/xwt/Main.java +++ b/src/org/xwt/Main.java @@ -31,8 +31,14 @@ public class Main { /** don't check if all surfaces are gone (and quit) until this is true */ public static boolean doneInitializing = false; + public static void main(String[] args) throws Exception { + org.xwt.imp.MIPSInterpreter interpreter = new org.xwt.imp.MIPSInterpreter(); + System.out.println("exit code: " + + interpreter.run(new String[] { "build/mips/freetype.mips", "padua.ttf" })); + } + /** common entry point */ - public static void main(String[] args) { + public static void main_(String[] args) { try { int startargs = 0; while (true) { -- 1.7.10.4