Changeset 19596 for release-kits

Show
Ignore:
Timestamp:
26.05.2009 11:57:02 (11 years ago)
Author:
oranfry
Message:

compile cdrom wrapper from main wrapper with CDROM macro

Files:
1 modified

Legend:

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

    r19592 r19596  
    5959 
    6060    <target name="compile-cdrom-wrapper"> 
    61         <copy file="${rk.home}/linux/cdrom-wrapper.cpp" todir="cdrom/build"/> 
     61        <copy file="${rk.home}/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/> 
    6262 
    6363        <echo level="info">compile the cdrom wrapper</echo> 
    6464        <exec executable="g++" dir="cdrom/build"> 
    65             <arg line="-Wall -static -static-libgcc -c -o cdrom-wrapper.o cdrom-wrapper.cpp"/> 
     65            <arg line="-Wall -static -static-libgcc -c -DCDROM -o wrapper.o wrapper.cpp"/> 
    6666        </exec> 
    6767 
    6868        <echo level="info">link the compiled code</echo> 
    6969        <exec executable="g++" dir="cdrom/build"> 
    70             <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux cdrom-wrapper.o"/> 
     70            <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux wrapper.o"/> 
    7171        </exec> 
    7272