Merge branch 'master' into lpcm_encoder

[vlc] / extras / package / win32 / configure-cygwin.sh

diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh
index 321ccc020be1f469bce104b38cf30e6f4a6fc554..2cc48eebe31758b688c123453b0c89be9c6324df 100755 (executable)
--- a/extras/package/win32/configure-cygwin.sh
+++ b/extras/package/win32/configure-cygwin.sh
@@ -1,7 +1,20 @@
-PATH="/usr/win32/bin:$PATH" \
-PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
-LDFLAGS="-L/usr/win32/lib" \
+#!/bin/sh
+
+root=$(echo $0|sed 's#extras/package/win32/configure-cygwin.sh##')./
+
+if [ -n $1 ]
+then
+       CONTRIBS="$1"
+else
+       CONTRIBS="/usr/win32"
+fi
+export CONTRIBS
+
+PATH="$CONTRIBS/bin:$PATH" \
+PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
+CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
+LDFLAGS="-L$CONTRIBS/lib" \
 CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
-CONFIG="./configure --host=i686-pc-mingw32 --disable-taglib" \
-sh extras/package/win32/configure-common.sh
+CONFIG="${root}configure --host=i686-pc-mingw32
+       --disable-nls --disable-taglib --disable-mkv --disable-dirac --enable-debug" \
+sh ${root}extras/package/win32/configure-common.sh