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

diff --git a/src/org/xwt/plat/Win32.xml b/src/org/xwt/plat/Win32.xml
index aade505..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>
                                                                          
@@ -17,52 +19,4 @@
         </exec>
     </target>
 
-    <target name="dist">
-        <echo message='creating ActiveX dll...'/>
-        <delete dir='bin-Win32/cabsrc/'/>
-        <mkdir dir='bin-Win32/cabsrc/'/>
-        <bash>
-            /usr/local/gcc/bin/i686-pc-mingw32-g++     -DCOMPILE_DLL -DBUILDID=\"${build-id}\" -DCLSID_STRUCT="${clsid-struct}" \
-                                                       -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/cabsrc/xwt-${build-id}.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/cabsrc/xwt-${build-id}.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/cabsrc/xwt-${build-id}.dll \
-                                                       bin-Win32/Win32-dll.o -lole32 -luuid
-        </bash>
-
-        <echo message='creating area to be signed in bin-Win32/cabsrc/...'/>
-
-        <bash>
-            cat > bin-Win32/cabsrc/xwt-${build-id}.inf &lt;&lt;\EOF
-;; This file will be copied to bin-Win32/xwt-${build-id}.inf and then packed up
-;; into the .cab file for distribution
-
-[version]
-    signature="$CHICAGO$"
-    AdvancedINF=2.0
- [Add.Code]
-    xwt-${build-id}.dll=xwt-${build-id}.dll
-    xwt-${build-id}.exe=xwt-${build-id}.exe
- [xwt-${build-id}.dll]
-    file-win32-x86=thiscab
-    clsid=${clsid-string}
-    FileVersion=7,0,0,0
-    RegisterServer=yes
- [xwt-${build-id}.exe]
-    file-win32-x86=thiscab
-    clsid={FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFE}
-    FileVersion=7,0,0,0
-    RegisterServer=no
-EOF
-        </bash>
-        <copy file='bin-Win32/xwt.exe' tofile='bin-Win32/cabsrc/xwt-${build-id}.exe'/>
-        <bash> /usr/local/gcc/bin/i686-pc-mingw32-strip bin-Win32/cabsrc/xwt-${build-id}.exe </bash>
-
-    </target>
-
 </project>