[vlc-commits] commit: windows config scripts: add win64 ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sat Oct  9 00:26:23 2010 +0200| [7b9e1bc30e2fb4c60d350584dcab808fd3cea4ad] | committer: Rafaël Carré 

windows config scripts: add win64

separate path to ./configure and options
-> we can disable specific options for win64

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

 extras/package/win32/configure-common.sh        |    5 +++--
 extras/package/win32/configure-cygwin.sh        |    5 +++--
 extras/package/win32/configure-mingw-release.sh |    3 ++-
 extras/package/win32/configure-mingw.sh         |    3 ++-
 extras/package/win32/configure-mingw64.sh       |   22 ++++++++++++++++++++++
 extras/package/win32/configure-msys.sh          |    3 ++-
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 7e9ea68..f405a9b 100755
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -3,7 +3,7 @@ then
 	CONTRIBS=/usr/win32
 fi
 
-      $CONFIG \
+      $CONFIGURE \
       --without-contrib \
       --enable-update-check \
       --enable-lua \
@@ -35,4 +35,5 @@ fi
       --enable-zvbi --disable-telx \
       --disable-dvb \
       --disable-sqlite \
-      --enable-peflags
+      --enable-peflags \
+      $CONFIGOPTS
diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh
index 2cc48ee..94ffb21 100755
--- a/extras/package/win32/configure-cygwin.sh
+++ b/extras/package/win32/configure-cygwin.sh
@@ -15,6 +15,7 @@ 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="${root}configure --host=i686-pc-mingw32
-       --disable-nls --disable-taglib --disable-mkv --disable-dirac --enable-debug" \
+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
index d5898fa..77496d4 100755
--- a/extras/package/win32/configure-mingw-release.sh
+++ b/extras/package/win32/configure-mingw-release.sh
@@ -15,6 +15,7 @@ PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
 CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
 LDFLAGS="-L$CONTRIBS/lib" \
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
+CONFIGURE="${root}configure" \
+CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
  --enable-dirac --enable-mkv --enable-taglib --enable-release --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
index 905acdd..b6e0108 100755
--- a/extras/package/win32/configure-mingw.sh
+++ b/extras/package/win32/configure-mingw.sh
@@ -15,6 +15,7 @@ PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
 CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
 LDFLAGS="-L$CONTRIBS/lib" \
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
+CONFIGURE="${root}configure" \
+CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
  --enable-dirac --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
new file mode 100755
index 0000000..585804e
--- /dev/null
+++ b/extras/package/win32/configure-mingw64.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+root=$(echo $0|sed 's#extras/package/win32/configure-mingw64.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=amd64-mingw32msvc-gcc CXX=amd64-mingw32msvc-g++ \
+CONFIGURE="${root}configure" \
+CONFIGOPTS="--host=amd64-mingw32msvc --build=i386-linux
+ --enable-dirac --enable-mkv --enable-taglib --enable-debug --enable-projectm
+ --disable-portaudio --disable-qt4 --disable-skins2 --disable-activex --disable-mozilla" \
+sh ${root}extras/package/win32/configure-common.sh
diff --git a/extras/package/win32/configure-msys.sh b/extras/package/win32/configure-msys.sh
index 1fd5d5c..acec8cc 100755
--- a/extras/package/win32/configure-msys.sh
+++ b/extras/package/win32/configure-msys.sh
@@ -15,6 +15,7 @@ PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
 CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
 LDFLAGS="-L$CONTRIBS/lib" \
 CC=gcc CXX=g++ \
-CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
+CONFIGURE="${root}configure" \
+CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
     --disable-mkv --disable-taglib --disable-nls --disable-dirac --enable-debug" \
 sh ${root}extras/package/win32/configure-common.sh