2004/01/19 21:01:14

darcs-hash:20040130080420-2ba56-93eea797bd679a76ccf441aadcf17a5e7dee9dc1.gz

diff --git a/Makefile b/Makefile
index 9c68fe3..2c2e266 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
-       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.plat.$(platform) -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################

diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java
index 211c88c..af16477 100644 (file)
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/xwt/plat/Darwin.java
@@ -10,6 +10,7 @@ import org.xwt.*;
 import java.util.*;
 
 public class Darwin extends POSIX {
+    public static void main(String[] s) { Main.main(s); }
     static Darwin singleton;
     private CarbonOpenGL openGL;
     boolean jaguar; // true if we are on OS X >= 10.2

diff --git a/src/org/xwt/plat/Linux.java b/src/org/xwt/plat/Linux.java
index 1374712..16129a3 100644 (file)
--- a/src/org/xwt/plat/Linux.java
+++ b/src/org/xwt/plat/Linux.java
@@ -7,9 +7,10 @@ import org.xwt.*;
 public abstract class Linux extends X11 {
 
     private native void fixEnvironment();
-    
+
+    public static void main(String[] s) { Main.main(s); }
     public Linux() {
-        //fixEnvironment();
+        fixEnvironment();
     }
 
 }

diff --git a/src/org/xwt/plat/Solaris.java b/src/org/xwt/plat/Solaris.java
index df1eef7..db748ce 100644 (file)
--- a/src/org/xwt/plat/Solaris.java
+++ b/src/org/xwt/plat/Solaris.java
@@ -5,4 +5,5 @@ import org.xwt.*;
 
 /** Solaris with an X11 display */
 public abstract class Solaris extends X11 {
+    public static void main(String[] s) { Main.main(s); }
 }

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 0204b4d..e4c3ff2 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -9,6 +9,7 @@ import java.io.*;
 
 /** Platform specific code for GCJ-compiled Win32 binaries */
 public class Win32 extends GCJ {
+    public static void main(String[] s) { Main.main(s); }
 
     // Initialization ////////////////////////////////////////////////////////////////////////////