[vlc-commits] win32 configure helpers: merge into one script

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov 20 14:15:33 2011 -0500| [3f311b7280df3e9dae7c0f69134336a841f01803] | committer: Rafaël Carré

win32 configure helpers: merge into one script

autodetect cygwin compiler
you now have to specify --host option (and --disable-nls or --enable-debug) as argument

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

 extras/package/win32/configure-common.sh        |   34 -------------------
 extras/package/win32/configure-cygwin.sh        |   11 ------
 extras/package/win32/configure-mingw-release.sh |   11 ------
 extras/package/win32/configure-mingw.sh         |   11 ------
 extras/package/win32/configure-mingw64.sh       |   16 ---------
 extras/package/win32/configure-msys.sh          |   11 ------
 extras/package/win32/configure.sh               |   41 +++++++++++++++++++++++
 7 files changed, 41 insertions(+), 94 deletions(-)

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
deleted file mode 100755
index b40113f..0000000
--- a/extras/package/win32/configure-common.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-[ -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
diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh
deleted file mode 100755
index 1c7fcff..0000000
--- a/extras/package/win32/configure-cygwin.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
diff --git a/extras/package/win32/configure-mingw-release.sh b/extras/package/win32/configure-mingw-release.sh
deleted file mode 100755
index e1b9e68..0000000
--- a/extras/package/win32/configure-mingw-release.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
diff --git a/extras/package/win32/configure-mingw.sh b/extras/package/win32/configure-mingw.sh
deleted file mode 100755
index 4581fed..0000000
--- a/extras/package/win32/configure-mingw.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
diff --git a/extras/package/win32/configure-mingw64.sh b/extras/package/win32/configure-mingw64.sh
deleted file mode 100755
index 4b2e06c..0000000
--- a/extras/package/win32/configure-mingw64.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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
diff --git a/extras/package/win32/configure-msys.sh b/extras/package/win32/configure-msys.sh
deleted file mode 100755
index 1640c2f..0000000
--- a/extras/package/win32/configure-msys.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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
diff --git a/extras/package/win32/configure.sh b/extras/package/win32/configure.sh
new file mode 100755
index 0000000..4f444af
--- /dev/null
+++ b/extras/package/win32/configure.sh
@@ -0,0 +1,41 @@
+#!/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} $*