From f581386fe4d2b3154f5bf3a658c6e74976b36ddf Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:34:28 +0000 Subject: [PATCH] 2003/09/13 05:26:07 darcs-hash:20040130073428-2ba56-45bcc8987be5dbcd85fbe636ef26f2aea4f57ebd.gz --- Makefile | 12 +++++++----- src/org/xwt/plat/AWT.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e8e1aeb..e89bfd9 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-l Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)" +# default +platform := JVM + darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib @@ -42,10 +45,9 @@ superclass_%: @echo $* @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__) -plat_deps := $(shell test "$(platform)" = "" || make -s superclass_org.xwt.plat.$(platform) platform= ) +plat_deps := $(make -s superclass_org.xwt.plat.$(platform) platform= ) java_sources := $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps)) java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp)) -#java_sources += build/java/org/xwt/Builtin.java java_sources += $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/plat/*')) build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ @@ -63,13 +65,13 @@ build/java/%.java: src/%.java.pp build/class/%.class: build/java/%.java .jikes @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p build/class -# @./.jikes $< + @./.jikes $< compile: .compile -.compile: $(java_sources) +.compile: $(java_sources) $(patsubst src/%, build/java/%, $(shell ls src/org/xwt/plat/*.java)) @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" mkdir -p build/class - @./.jikes $(java_sources) build/org/xwt/imp/Freetype.java + @./.jikes $^ touch .compile # PHASE 4: gcj-generated headers diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java index b9e58c3..676378c 100644 --- a/src/org/xwt/plat/AWT.java +++ b/src/org/xwt/plat/AWT.java @@ -12,7 +12,7 @@ import java.awt.image.*; import java.awt.event.*; /** Platform subclass for all VM's providing AWT 1.1 functionality */ -public class AWT extends Platform { +public class AWT extends JVM { protected String getDescriptiveName() { return "Generic JDK 1.1+ with AWT"; } protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new AWTDoubleBuffer(w, h); } -- 1.7.10.4