Changeset 19595

Show
Ignore:
Timestamp:
26.05.2009 11:56:42 (10 years ago)
Author:
oranfry
Message:

compile cdrom wrapper from main wrapper with CDROM macro

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/ant-scripts/create-cdrom-components.xml

    r19586 r19595  
    5454    <target name="compile-cdrom-wrapper"> 
    5555        <copy file="${wirk2.home}/greenstone2/icon/icon.ico" todir="cdrom/build"/> 
    56         <echo file="cdrom/build/cdrom-wrapper.rc">MAINICON ICON "icon.ico"</echo> 
     56        <echo file="cdrom/build/wrapper.rc">MAINICON ICON "icon.ico"</echo> 
    5757        <exec executable="rc" dir="cdrom/build"> 
    58             <arg line="cdrom-wrapper.rc"/> 
     58            <arg line="wrapper.rc"/> 
    5959        </exec> 
    6060        <exec executable="cl" dir="cdrom/build"> 
    61             <arg line="/c -GX ${rk.home}/windows/wrapper/cdrom-wrapper.cpp /out:cdrom-wrapper.obj"/> 
     61            <arg line="/c -GX -DCDROM ${rk.home}/windows/wrapper/wrapper.cpp /out:wrapper.obj"/> 
    6262        </exec> 
    6363        <exec executable="link" dir="cdrom/build"> 
    64             <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib cdrom-wrapper.obj cdrom-wrapper.RES"/> 
     64            <arg line="/OUT:../dist/Greenstone-${version}-windows.exe gdi32.lib advapi32.lib shell32.lib user32.lib wrapper.obj wrapper.RES"/> 
    6565        </exec> 
    6666