changeset 26:902ac70ae6ad

fixes for systems where wine confuses the cross-compiling detection of ./configure
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 25 Jun 2007 12:42:06 +0200
parents 5d4729223225
children 950d65c7d6bf
files build_mingw_cross_env.sh
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/build_mingw_cross_env.sh	Sun Jun 24 22:10:35 2007 +0200
+++ b/build_mingw_cross_env.sh	Mon Jun 25 12:42:06 2007 +0200
@@ -541,6 +541,8 @@
     cd "$SOURCE"
     tar xfvj "$DOWNLOAD/libgpg-error-$VERSION_libgpg_error.tar.bz2"
     cd "libgpg-error-$VERSION_libgpg_error"
+    # wine confuses the cross-compiling detection, so set it explicitly
+    sed 's,cross_compiling=no,cross_compiling=yes,' -i configure
     ./configure \
         --host="$TARGET" \
         --disable-shared \
@@ -995,21 +997,19 @@
     cd "$DOWNLOAD"
     tar tfz "smpeg_$VERSION_smpeg.orig.tar.gz" &>/dev/null ||
     wget -c "http://ftp.debian.org/debian/pool/main/s/smpeg/smpeg_$VERSION_smpeg.orig.tar.gz"
-    #svn checkout -r ... svn://svn.icculus.org/smpeg/trunk ...
     ;;
 
 --build)
     cd "$SOURCE"
     tar xfvz "$DOWNLOAD/smpeg_$VERSION_smpeg.orig.tar.gz"
     cd "smpeg-$VERSION_smpeg.orig"
-    #cp -R "$DOWNLOAD/smpeg-trunk" smpeg-trunk
-    #cd smpeg-trunk
     ./configure \
         --host="$TARGET" \
         --disable-shared \
         --disable-debug \
         --prefix="$PREFIX/$TARGET" \
         --with-sdl-prefix="$PREFIX/$TARGET" \
+        --disable-sdltest \
         --disable-gtk-player \
         --disable-opengl-player
     gmake install bin_PROGRAMS= noinst_PROGRAMS=
@@ -1049,7 +1049,9 @@
         --disable-shared \
         --prefix="$PREFIX/$TARGET" \
         --with-sdl-prefix="$PREFIX/$TARGET" \
-        --with-smpeg-prefix="$PREFIX/$TARGET"
+        --disable-sdltest \
+        --with-smpeg-prefix="$PREFIX/$TARGET" \
+        --disable-smpegtest
     gmake install bin_PROGRAMS= noinst_PROGRAMS=
     ;;