Changeset 19596

Timestamp:

2009-05-26T11:57:02+12:00 (15 years ago)

Author:

oranfry

Message:

compile cdrom wrapper from main wrapper with CDROM macro

File:

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

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

@@ -59 +59 @@
 
     <target name="compile-cdrom-wrapper">
-        <copy file="${rk.home}/linux/cdrom-wrapper.cpp" todir="cdrom/build"/>
+        <copy file="${rk.home}/linux/wrapper.cpp" todir="cdrom/build" overwrite="true"/>
 
         <echo level="info">compile the cdrom wrapper</echo>
         <exec executable="g++" dir="cdrom/build">
-            <arg line="-Wall -static -static-libgcc -c -o cdrom-wrapper.o cdrom-wrapper.cpp"/>
+            <arg line="-Wall -static -static-libgcc -c -DCDROM -o wrapper.o wrapper.cpp"/>
         </exec>
 
         <echo level="info">link the compiled code</echo>
         <exec executable="g++" dir="cdrom/build">
-            <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux cdrom-wrapper.o"/>
+            <arg line="-static -static-libgcc -o ../dist/Greenstone-${version}-linux wrapper.o"/>
         </exec>