[vlc-devel] commit: Rework windows configure. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Thu Jul  3 19:26:03 2008 +0200| [993a4c66b77bb55855140dde5708994553257c1b]

Rework windows configure.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=993a4c66b77bb55855140dde5708994553257c1b
---

 extras/package/win32/configure-cygwin.sh |   39 +----------------------------
 extras/package/win32/configure-mingw.sh  |   39 +----------------------------
 2 files changed, 4 insertions(+), 74 deletions(-)

diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh
index bf21562..321ccc0 100755
--- a/extras/package/win32/configure-cygwin.sh
+++ b/extras/package/win32/configure-cygwin.sh
@@ -3,40 +3,5 @@ PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
 CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
 LDFLAGS="-L/usr/win32/lib" \
 CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
-      ./configure --host=i686-pc-mingw32 \
-      --enable-release \
-      --without-contrib \
-      --enable-nls \
-      --enable-shared-libvlc \
-      --enable-update-check \
-      --enable-lua \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
-      --enable-twolame \
-      --enable-quicktime \
-      --enable-real \
-      --disable-dirac \
-      --enable-realrtsp \
-      --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --with-ffmpeg-config-path=/usr/win32/bin --with-ffmpeg-zlib \
-      --enable-livedotcom --with-livedotcom-tree=/usr/win32/live.com \
-      --enable-dca \
-      --disable-mkv \
-      --enable-x264 \
-      --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
-      --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-qt4 \
-      --enable-wxwidgets --with-wx-config-path=/usr/win32/lib/wx/config \
-      --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-taglib
+CONFIG="./configure --host=i686-pc-mingw32 --disable-taglib" \
+sh extras/package/win32/configure-common.sh
diff --git a/extras/package/win32/configure-mingw.sh b/extras/package/win32/configure-mingw.sh
index 9b070e4..813fc55 100755
--- a/extras/package/win32/configure-mingw.sh
+++ b/extras/package/win32/configure-mingw.sh
@@ -3,40 +3,5 @@ PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
 CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
 LDFLAGS="-L/usr/win32/lib" \
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-      ./configure --host=i586-mingw32msvc --build=i386-linux \
-      --enable-release \
-      --without-contrib \
-      --enable-nls \
-      --enable-shared-libvlc \
-      --enable-update-check \
-      --enable-lua \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
-      --enable-twolame \
-      --enable-quicktime \
-      --enable-real \
-      --enable-dirac \
-      --enable-realrtsp \
-      --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --with-ffmpeg-config-path=/usr/win32/bin --with-ffmpeg-zlib \
-      --enable-livedotcom --with-livedotcom-tree=/usr/win32/live.com \
-      --enable-dca \
-      --enable-mkv \
-      --enable-x264 \
-      --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
-      --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-qt4 \
-      --enable-wxwidgets --with-wx-config-path=/usr/win32/lib/wx/config \
-      --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 \
-
+CONFIG="./configure --host=i586-mingw32msvc --build=i386-linux" \
+sh extras/package/win32/configure-common.sh