From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:05:57 +0000 (+0000)
Subject: 2003/09/08 20:02:04
X-Git-Tag: RC3~659
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=2c0a0e697eace6306b7ff8a9918cb2a42a26ddef

2003/09/08 20:02:04

darcs-hash:20040130070557-2ba56-f94d695b0b8eac0fa67159c049b1723044d88436.gz
---

diff --git a/Makefile b/Makefile
index 9c249c1..f2b8eaa 100644
--- a/Makefile
+++ b/Makefile
@@ -77,11 +77,11 @@ build/h/%.h: build/class/%.class .compile
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
 	ls `echo $< | sed s/.class\$$//`*.class |\
-		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/gcjh -d ../h --classpath .)
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/$(target)-gcjh -d ../h --classpath .)
 
 # a hack since we've disabled gcj's awt implementation
-build/$(platform)/org/xwt/plat/Java2.java.o: ; touch $@
-build/$(platform)/org/xwt/plat/AWT.java.o: ; touch $@
+build/$(platform)/org/xwt/plat/Java2.java.o: ; mkdir -p $(@D); touch $@
+build/$(platform)/org/xwt/plat/AWT.java.o: ; mkdir -p $(@D); touch $@
 
 build/$(platform)/%.java.o: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java
index 983c42f..813cc75 100644
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/xwt/plat/Darwin.java
@@ -156,7 +156,7 @@ public class Darwin extends POSIX {
         public void toBack() { CarbonMessage.add(new CarbonMessage() { public void perform() { natToBack(); } }); }
         private native void natSetLimits(int minWidth, int minHeight, int maxWidth, int maxHeight);
         public void setLimits(final int mnw, final int mnh, final int mxw, final int mxh) {
-            if(Carbon.singleton.jaguar)
+            if(Darwin.singleton.jaguar)
                 CarbonMessage.add(new CarbonMessage() { public void perform() { natSetLimits(mnw,mnh,mxw,mxh); } });
         }
         private native void natSyncCursor(int n);