with-peflags was removed

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

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 00a57bf58dea760c89a78be7c17f9b84f44d5052..b40113f934ed6776633ad08d5df7ba21ed9acb77 100755 (executable)
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -1,6 +1,7 @@
-      $CONFIG \
-      --without-contrib \
-      --enable-shared-libvlc \
+[ -z $CONTRIB_DIR ] && export CONTRIB_DIR=/usr/win32
+
+  $CONFIGURE \
+      --with-contrib="$CONTRIB_DIR" \
       --enable-update-check \
       --enable-lua \
       --enable-faad \
@@ -9,28 +10,25 @@
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-realrtsp \
-      --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --with-ffmpeg-config-path=/usr/win32/bin --with-ffmpeg-zlib \
-      --enable-live555 --with-live555-tree=/usr/win32/live.com \
+      --enable-avcodec --enable-merge-ffmpeg \
       --enable-dca \
+      --enable-mpc \
       --enable-libass \
       --enable-x264 \
-      --enable-zvbi --disable-telx \
-      --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
+      --enable-schroedinger \
+      --enable-realrtsp \
+      --enable-live555 \
+      --enable-dvdread \
       --enable-shout \
       --enable-goom \
-      --enable-caca --with-caca-config-path=/usr/win32/bin \
-      --enable-portaudio \
-      --enable-sdl --with-sdl-config-path=/usr/win32/bin \
+      --enable-caca \
+      --disable-portaudio \
+      --disable-sdl \
       --enable-qt4 \
-      --disable-wxwidgets \
-      --with-freetype-config-path=/usr/win32/bin \
-      --with-fribidi-config-path=/usr/win32/bin \
-      --with-xml2-config-path=/usr/win32/bin \
-      --enable-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
-      --enable-activex \
-      --disable-gnomevfs --disable-hal --disable-gtk \
-      --disable-cddax --disable-vcdx \
-      --disable-libcddb --disable-dvb --disable-zvbi \
-      --disable-pulse
+      --enable-skins2 \
+      --enable-sse --enable-mmx \
+      --enable-libcddb \
+      --enable-zvbi --disable-telx \
+      --enable-sqlite \
+      --disable-dirac \
+      $CONFIGOPTS