Changeset 19595

Timestamp:

2009-05-26T11:56:42+12:00 (15 years ago)

Author:

oranfry

Message:

compile cdrom wrapper from main wrapper with CDROM macro

File:

• release-kits/wirk2/ant-scripts/create-cdrom-components.xml (modified) (1 diff)

release-kits/wirk2/ant-scripts/create-cdrom-components.xml

@@ -54 +54 @@
     <target name="compile-cdrom-wrapper">
         <copy file="${wirk2.home}/greenstone2/icon/icon.ico" todir="cdrom/build"/>
-        <echo file="cdrom/build/cdrom-wrapper.rc">MAINICON ICON "icon.ico"</echo>
+        <echo file="cdrom/build/wrapper.rc">MAINICON ICON "icon.ico"</echo>
         <exec executable="rc" dir="cdrom/build">
-            <arg line="cdrom-wrapper.rc"/>
+            <arg line="wrapper.rc"/>
         </exec>
         <exec executable="cl" dir="cdrom/build">
-            <arg line="/c -GX ${rk.home}/windows/wrapper/cdrom-wrapper.cpp /out:cdrom-wrapper.obj"/>
+            <arg line="/c -GX -DCDROM ${rk.home}/windows/wrapper/wrapper.cpp /out:wrapper.obj"/>
         </exec>
         <exec executable="link" dir="cdrom/build">
-            <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib cdrom-wrapper.obj cdrom-wrapper.RES"/>
+            <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/>
         </exec>