Changeset 22828

Show
Ignore:
Timestamp:
01.09.2010 14:36:47 (9 years ago)
Author:
sjm84
Message:

Fixed using the gnome-lib extension on Mac

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r22821 r22828  
    184184            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 
    185185                <arg line="--enable-apache-httpd"/> 
     186                <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/darwin/bin:${env.PATH}"/>  
     187                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
     188                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
     189                <env key="LDFLAGS" value="-L${basedir}/compiled/ext/gnome-lib/darwin/lib"/> 
    186190            </exec> 
    187191 
     
    196200            <!-- make --> 
    197201            <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 
    198                 <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}"/>  
    199                 <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    200                 <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    201                 <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/> 
     202                <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/${os.shell}/bin:${env.PATH}"/>  
     203                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
     204                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
     205                <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/${os.shell}/lib"/> 
    202206            </exec> 
    203207 
     
    212216                <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    213217            </exec> 
     218 
     219            <delete dir="${basefir}/compiled/ext/gnome-lib"/> 
    214220        </if> 
    215221