2003/02/15 11:43:08

darcs-hash:20040130065134-2ba56-a4e5bdc2a0180aea1a47ec562624aaca5c60c91d.gz

diff --git a/CHANGES b/CHANGES
index d978c28..53e6f08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -488,7 +488,7 @@
 
 11-Feb megacz Picture.java: added 'abstract' keyword
 
-
+15-Feb megacz GCJ.xml, Linux.xml, Win32.xml: fixed linkage bug
 
 
 

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 5051f0c..66761d5 100644 (file)
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -34,11 +34,10 @@
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/'>
+            <fileset dir='src/' includes='${javafiles}'>
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
-                <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
                 <exclude name='org/xwt/Trap.java'/>
@@ -74,7 +73,7 @@
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/' includes='org/xwt/plat/${subplat}.cc'/>
+            <fileset dir='src/' includes='${ccfiles}'/>
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
@@ -105,7 +104,7 @@
             <arg value='--main=org.xwt.Main'/>
             <arg line='-o bin-${plat}/${binaryname}'/>
             <srcfile/>
-            <arg line='-L${gcc-path}/lib ${linkflags}'/>
+            <arg line='${linkflags}'/>
        </apply>
     </target>
 

diff --git a/src/org/xwt/plat/Linux.xml b/src/org/xwt/plat/Linux.xml
index 6e52814..c8f61db 100644 (file)
--- a/src/org/xwt/plat/Linux.xml
+++ b/src/org/xwt/plat/Linux.xml
@@ -4,9 +4,10 @@
 
     <target name="build">
         <property name="gcc-target" value=""/>
-        <property name="linkflags" value="-L/usr/X11R6/lib -lX11 -lXext --static"/>
+        <property name="linkflags" value="-L${gcc-path}/lib -L/usr/X11R6/lib -lX11 -lXext --static"/>
         <property name="binaryname" value="xwt"/>
-        <property name="subplat" value="X11"/>
+        <property name="ccfiles" value="org/xwt/plat/X11.cc,org/xwt/plat/POSIX.cc"/>
+        <property name="javafiles" value="org/xwt/plat/X11.java,org/xwt/plat/POSIX.java"/>
         <ant target="build" antfile="src/org/xwt/plat/GCJ.xml"/>
     </target>
                                                                          

diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index bdfa2d7..dad696e 100644 (file)
--- a/src/org/xwt/plat/Win32.xml
+++ b/src/org/xwt/plat/Win32.xml
@@ -6,7 +6,8 @@
         <property name="gcc-target" value="i686-pc-mingw32-"/>
         <property name="linkflags" value="-Wl,--subsystem,windows -lcomdlg32"/>
         <property name="binaryname" value="xwt.exe"/>
-        <property name="subplat" value="Win32"/>
+        <property name="javafiles" value="org/xwt/plat/Win32.java"/>
+        <property name="ccfiles" value="org/xwt/plat/Win32.cc"/>
         <ant target="build" antfile="src/org/xwt/plat/GCJ.xml"/>
     </target>