X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2Fplat%2FGCJ.xml;h=e8b514b1adff064db4b766a62af5e0e03081e40f;hb=bb445c7a3a887d6c3ad604d2c789c3a63a8823b7;hp=30d0d33208c564e45ab90ef6e1c5a9356c62cf6e;hpb=b4226786de679301ec77837f4ab824d90aaf5220;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 30d0d33..e8b514b 100644
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -21,7 +21,7 @@
         <gcjh out='bin-${plat}' classpath='bin'/>
 
         <echo message='compiling   .java -> .o'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}'>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar:src/'/>
             <arg value='-O9'/>
             <arg value='-g'/>
@@ -35,7 +35,7 @@
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
-                <include name='org/xwt/plat/${plat}.java'/>
+                <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
             </fileset>
@@ -43,23 +43,23 @@
         </apply>
 
         <echo message='compiling     .cc -> .o'/>
-            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}/'>
+            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}/'>
             <arg value='-g'/>
             <arg value='-Ibin-${plat}'/>
             <arg value='-c'/>
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/' includes='org/xwt/plat/${plat}.cc'/>
+            <fileset dir='src/' includes='org/xwt/plat/${subplat}.cc'/>
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
-                                                                                      <echo message='linking        .o -> ${binaryname}'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' parallel='true'>
+        <echo message='linking        .o -> ${binaryname}'/>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' parallel='true'>
             <fileset dir='bin-${plat}/' includes='**/*.o' excludes='*.o'/>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar'/>
             <arg value='--main=org.xwt.Main'/>
-            <arg line='-o www/html/dist/${binaryname}'/>
+            <arg line='-o bin-${plat}/${binaryname}'/>
             <srcfile/>
             <arg line='${linkflags}'/>
        </apply>