X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.xml;h=dad696e70399f2f70eeca7094b8a478632b29a32;hb=e819b3bfd2a1480035b4831866071058eedcea60;hp=ee301d8d1ba33e780e7a8e2623c3ed777f94bd05;hpb=6242c991f365dbd67eba62ecfa5df769a83fcbc6;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index ee301d8..dad696e 100644
--- a/src/org/xwt/plat/Win32.xml
+++ b/src/org/xwt/plat/Win32.xml
@@ -3,9 +3,11 @@
 <project name="Win32" default="build">
 
     <target name="build">
-        <property name="gcc-target" value="i686-pc-mingw32"/>
-        <property name="linkflags" value="-Wl,--subsystem,windows"/>
+        <property name="gcc-target" value="i686-pc-mingw32-"/>
+        <property name="linkflags" value="-Wl,--subsystem,windows -lcomdlg32"/>
         <property name="binaryname" value="xwt.exe"/>
+        <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>
                                                                          
@@ -13,36 +15,8 @@
         <echo message='launching .exe'/>
         <exec dir='.' executable='/usr/bin/ssh'>
             <arg value='${cygwin-host}'/>
-            <arg value='cd ${cygwin-path}; www/html/dist/xwt.exe src org.xwt.demo.main'/>
+            <arg value='cd ${cygwin-path}; bin-Win32/xwt.exe src org.xwt.demo.main'/>
         </exec>
     </target>
 
-    <target name="dist">
-        <echo message='creating ActiveX dll...'/>
-        <bash>
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -DCOMPILE_DLL -c src/org/xwt/plat/Win32.cc -o bin-Win32/Win32-dll.o
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile -mdll -Wl,-e,_DllMainCRTStartup@12 \
-                                                       -o bin-Win32/xwt.dll bin-Win32/Win32-dll.o -lole32 -luuid
-            /usr/local/gcc/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp \
-                                                       --def src/org/xwt/plat/Win32.def
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -Wl,--base-file,/tmp/basefile bin-Win32/xwt.exp -mdll \
-                                                       -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/xwt.dll bin-Win32/Win32-dll.o -lole32 -luuid
-            /usr/local/gcc/bin/i686-pc-mingw32-dlltool --base-file /tmp/basefile --output-exp bin-Win32/xwt.exp --def src/org/xwt/plat/Win32.def
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     bin-Win32/xwt.exp -mdll -Wl,-e,_DllMainCRTStartup@12 -o bin-Win32/xwt.dll \
-                                                       bin-Win32/Win32-dll.o -lole32 -luuid
-        </bash>
-
-        <echo message='collecting files to archive in a cab...'/>
-        <copy file='src/org/xwt/plat/Win32.inf' tofile='bin-Win32/xwt.inf'/>
-        <copy file='www/html/dist/xwt.exe' tofile='bin-Win32/xwt.exe'/>
-        <bash> /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/xwt.exe </bash>
-
-        <echo message='building cab file...'/>
-        <exec dir='.' executable='/usr/bin/ssh'>
-           <arg value='${cygwin-host}'/>
-           <arg value='cd ${cygwin-path}/bin-Win32; ../lib/cabarc.exe -s 6144 N xwt.cab xwt.dll xwt.exe xwt.inf'/>
-        </exec>
-        <copy file='bin-Win32/xwt.cab' tofile='www/html/dist/xwt.cab'/>
-    </target>
-
 </project>