2004/01/14 01:44:21

darcs-hash:20040130074426-2ba56-aebef440c7b2d06e9a10d44beb0cce3a73a95779.gz

diff --git a/Makefile b/Makefile
index 6641501..b4d2979 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ dist-clean:
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
-Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
+Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,console -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
 
 # default
@@ -61,7 +61,7 @@ build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
        @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
        (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
         java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
-        | sed 's,//.*$$,,;'|tr -d '\n' > $@
+        | sed 's,//.*$$,,;'|tr -d '\n'  > $@
 
 build/java/org/xwt/%.java: src/org/xwt/%.java
        make build/class/org/xwt/util/Preprocessor.class
@@ -113,6 +113,8 @@ build/h/%.h: build/class/%.class
 # a hack since we've disabled gcj's awt implementation
 build/$(platform)/org/xwt/plat/Java2.java.o:
        touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
+       $(gcj) -c $< -o $@
 build/$(platform)/org/xwt/plat/AWT.java.o:
        touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
 

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index d40d9df..0204b4d 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -197,7 +197,6 @@ public class Win32 extends GCJ {
     // Win32Picture ////////////////////////////////////////////////////////////////////////////
 
     public static class Win32Picture extends Picture {
-        int w = 0, h = 0;
 
         /** the Win32 bitmap version of this Picture */
         int hbitmap = -1;
@@ -218,8 +217,8 @@ public class Win32 extends GCJ {
         int maskdc = -1;
 
         public Win32Picture(JS r) { super(r); }
-        public int getWidth() { return w; };
-        public int getHeight() { return h; };
+        public int getWidth() { return width; };
+        public int getHeight() { return height; };
         public int[] getData() { return data; }
         boolean initialized = false;
         public void init() { if (!initialized && isLoaded) natInit(); initialized = true; }