Commit 88784aa9 authored by Rafaël Carré's avatar Rafaël Carré

win32 packaging: factorize by using --with-contrib and setting CONTRIB_DIR

parent 4a454208
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 \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment