vlc | branch: master | Rafaël Carré <[email protected]> | Wed Oct 13 17:36:33 2010 +0200| [88784aa9461933f075f40fd75b13e284cce84ea1] | committer: Rafaël Carré
win32 packaging: factorize by using --with-contrib and setting CONTRIB_DIR > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=88784aa9461933f075f40fd75b13e284cce84ea1 --- extras/package/win32/configure-common.sh | 11 ++++------- extras/package/win32/configure-cygwin.sh | 12 +----------- extras/package/win32/configure-mingw-release.sh | 12 +----------- extras/package/win32/configure-mingw.sh | 12 +----------- extras/package/win32/configure-mingw64.sh | 10 +++------- extras/package/win32/configure-msys.sh | 12 +----------- 6 files changed, 11 insertions(+), 58 deletions(-) diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh index 7ffacee..e9845d3 100755 --- a/extras/package/win32/configure-common.sh +++ b/extras/package/win32/configure-common.sh @@ -1,10 +1,7 @@ -if [ -z $CONTRIBS ] -then - CONTRIBS=/usr/win32 -fi +[ -z $CONTRIB_DIR ] && export CONTRIB_DIR=/usr/win32 - $CONFIGURE \ - --without-contrib \ + $CONFIGURE \ + --with-contrib \ --enable-update-check \ --enable-lua \ --enable-faad \ @@ -21,7 +18,7 @@ fi --enable-schroedinger \ --enable-realrtsp \ --enable-live555 \ - --enable-dvdread --with-dvdnav-config-path=$CONTRIBS/bin \ + --enable-dvdread --with-dvdnav-config-path=$CONTRIB_DIR/bin \ --enable-shout \ --enable-goom \ --enable-caca \ diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh index 94ffb21..1c7fcff 100755 --- a/extras/package/win32/configure-cygwin.sh +++ b/extras/package/win32/configure-cygwin.sh @@ -2,18 +2,8 @@ root=$(echo $0|sed 's#extras/package/win32/configure-cygwin.sh##')./ -if [ -n $1 ] -then - CONTRIBS="$1" -else - CONTRIBS="/usr/win32" -fi -export CONTRIBS +export CONTRIB_DIR="$1" -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" \ CONFIGURE="${root}configure" \ CONFIGOPTS="--host=i686-pc-mingw32 diff --git a/extras/package/win32/configure-mingw-release.sh b/extras/package/win32/configure-mingw-release.sh index 77496d4..bab0610 100755 --- a/extras/package/win32/configure-mingw-release.sh +++ b/extras/package/win32/configure-mingw-release.sh @@ -2,18 +2,8 @@ root=$(echo $0|sed 's#extras/package/win32/configure-mingw-release.sh##')./ -if [ -n "$1" ] -then - CONTRIBS="$1" -else - CONTRIBS="/usr/win32" -fi -export CONTRIBS +export CONTRIB_DIR="$1" -PATH="$CONTRIBS/bin:$PATH" \ -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++ \ CONFIGURE="${root}configure" \ CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux diff --git a/extras/package/win32/configure-mingw.sh b/extras/package/win32/configure-mingw.sh index b6e0108..0f91935 100755 --- a/extras/package/win32/configure-mingw.sh +++ b/extras/package/win32/configure-mingw.sh @@ -2,18 +2,8 @@ root=$(echo $0|sed 's#extras/package/win32/configure-mingw.sh##')./ -if [ -n "$1" ] -then - CONTRIBS="$1" -else - CONTRIBS="/usr/win32" -fi -export CONTRIBS +export CONTRIB_DIR="$1" -PATH="$CONTRIBS/bin:$PATH" \ -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++ \ CONFIGURE="${root}configure" \ CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux diff --git a/extras/package/win32/configure-mingw64.sh b/extras/package/win32/configure-mingw64.sh index e0c488f..e47634d 100755 --- a/extras/package/win32/configure-mingw64.sh +++ b/extras/package/win32/configure-mingw64.sh @@ -4,16 +4,12 @@ root=$(echo $0|sed 's#extras/package/win32/configure-mingw64.sh##')./ if [ -n "$1" ] then - CONTRIBS="$1" + CONTRIB_DIR="$1" else - CONTRIBS="/usr/win64" + CONTRIB_DIR="/usr/win64" fi -export CONTRIBS +export CONTRIB_DIR -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 diff --git a/extras/package/win32/configure-msys.sh b/extras/package/win32/configure-msys.sh index acec8cc..48af43c 100755 --- a/extras/package/win32/configure-msys.sh +++ b/extras/package/win32/configure-msys.sh @@ -2,18 +2,8 @@ root=$(echo $0|sed 's#extras/package/win32/configure-msys.sh##')./ -if [ -n "$1" ] -then - CONTRIBS="$1" -else - CONTRIBS="/usr/win32" -fi -export CONTRIBS +export CONTRIB_DIR="$1" -PATH="$CONTRIBS/bin:$PATH" \ -PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \ -CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \ -LDFLAGS="-L$CONTRIBS/lib" \ CC=gcc CXX=g++ \ CONFIGURE="${root}configure" \ CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
