+++ /dev/null
-[ -z $CONTRIB_DIR ] && export CONTRIB_DIR=/usr/win32
-
- $CONFIGURE \
- --with-contrib="$CONTRIB_DIR" \
- --enable-update-check \
- --enable-lua \
- --enable-faad \
- --enable-flac \
- --enable-theora \
- --enable-twolame \
- --enable-quicktime \
- --enable-real \
- --enable-avcodec --enable-merge-ffmpeg \
- --enable-dca \
- --enable-mpc \
- --enable-libass \
- --enable-x264 \
- --enable-schroedinger \
- --enable-realrtsp \
- --enable-live555 \
- --enable-dvdread \
- --enable-shout \
- --enable-goom \
- --enable-caca \
- --disable-portaudio \
- --disable-sdl \
- --enable-qt4 \
- --enable-skins2 \
- --enable-sse --enable-mmx \
- --enable-libcddb \
- --enable-zvbi --disable-telx \
- --enable-sqlite \
- --disable-dirac \
- $CONFIGOPTS
+++ /dev/null
-#!/bin/sh
-
-root=$(echo $0|sed 's#extras/package/win32/configure-cygwin.sh##')./
-
-export CONTRIB_DIR="$1"
-
-CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
-CONFIGURE="${root}configure" \
-CONFIGOPTS="--host=i686-pc-mingw32
---disable-nls --disable-taglib --disable-mkv --disable-dirac --enable-debug" \
-sh ${root}extras/package/win32/configure-common.sh
+++ /dev/null
-#!/bin/sh
-
-root=$(echo $0|sed 's#extras/package/win32/configure-mingw-release.sh##')./
-
-export CONTRIB_DIR="$1"
-
-CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-CONFIGURE="${root}configure" \
-CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
- --enable-mkv --enable-taglib --enable-nls --enable-projectm" \
-sh ${root}extras/package/win32/configure-common.sh
+++ /dev/null
-#!/bin/sh
-
-root=$(echo $0|sed 's#extras/package/win32/configure-mingw.sh##')./
-
-export CONTRIB_DIR="$1"
-
-CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-CONFIGURE="${root}configure" \
-CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
- --enable-mkv --enable-taglib --enable-debug --enable-projectm" \
-sh ${root}extras/package/win32/configure-common.sh
+++ /dev/null
-#!/bin/sh
-
-root=$(echo $0|sed 's#extras/package/win32/configure-mingw64.sh##')./
-
-if [ -n "$1" ]
-then
- CONTRIB_DIR="$1"
-else
- CONTRIB_DIR="/usr/win64"
-fi
-export CONTRIB_DIR
-
-CONFIGURE="${root}configure" \
-CONFIGOPTS="--host=x86_64-w64-mingw32 --build=i386-linux
- --enable-mkv --enable-taglib --disable-real --enable-debug" \
-sh ${root}extras/package/win32/configure-common.sh
+++ /dev/null
-#!/bin/sh
-
-root=$(echo $0|sed 's#extras/package/win32/configure-msys.sh##')./
-
-export CONTRIB_DIR="$1"
-
-CC=gcc CXX=g++ \
-CONFIGURE="${root}configure" \
-CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
- --disable-mkv --disable-taglib --disable-nls --enable-debug" \
-sh ${root}extras/package/win32/configure-common.sh
--- /dev/null
+#!/bin/sh
+
+OPTIONS="
+ --enable-update-check
+ --enable-lua
+ --enable-faad
+ --enable-flac
+ --enable-theora
+ --enable-twolame
+ --enable-quicktime
+ --enable-avcodec --enable-merge-ffmpeg
+ --enable-dca
+ --enable-mpc
+ --enable-libass
+ --enable-x264
+ --enable-schroedinger
+ --enable-realrtsp
+ --enable-live555
+ --enable-dvdread
+ --enable-shout
+ --enable-goom
+ --enable-caca
+ --disable-portaudio
+ --disable-sdl
+ --enable-qt4
+ --enable-skins2
+ --enable-sse --enable-mmx
+ --enable-libcddb
+ --enable-zvbi --disable-telx
+ --enable-sqlite
+ --disable-dirac"
+
+if gcc -v 2>/dev/null -a echo | gcc -mno-cygwin -E -2>/dev/null 2>&1
+then
+ echo Cygwin detected, adjusting options
+ export CC="gcc -mno-cygwin"
+ export CXX="g++ -mno-cygwin"
+ OPTIONS="${OPTIONS} --disable-taglib --disable-mkv"
+fi
+
+sh "$(dirname $0)"/../../../configure ${OPTIONS} $*