Skip to content

V
vlc
Commit 4881724b authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

contrib: Add some abstraction layers instead of using raw echo.

parent 067da77c
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 166 deletions
extras/contrib/bootstrap
View file @ 4881724b
......@@ -25,7 +25,7 @@
# ***************************************************************************
if test "$#" -gt "2" -o "$1" = "-h" -o "$1" = "--help" ; then
echo "Usage: $0 [host [distro]]" >&2
echo "Usage: $0 [target [distro]]" >&2
echo " Prepare config.mak and distro.mak file." >&2
exit 1
fi
......@@ -35,42 +35,72 @@ export LANG
set -e
set +x
add_makefile_cfg()
{
echo $1 >> "${config_mak}"
}
error()
{
echo "[contrib] ERROR: $1"
}
info()
{
echo "[contrib] $1"
}
ensure_macosx_sdk_presence()
{
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
}
DISTRO=
BUILDDIR=.
BUILD=`gcc -dumpmachine`
if test "$#" -ge "1"; then
HOST="$1"
TARGET="$1"
else
HOST="$BUILD"
TARGET="$BUILD"
fi
DISTRO=
if test "$#" = "2"; then
echo "Forcing distro.mak to use $2.mak"
info "Forcing distro.mak to use $2.mak"
DISTRO="$2"
HOST="$1"
TARGET="$1"
fi
rm -f config.mak
config_mak="${BUILDDIR}/config.mak"
rm -f "${config_mak}"
{
echo "# Automatically generated by bootstrap."
echo "# Make changes if you know what you're doing."
} > config.mak
} > "${config_mak}"
rm -f distro.mak
distro_mak="${BUILDDIR}/distro.mak"
rm -f "${distro_mak}"
{
echo "# Automatically generated by bootstrap"
echo "# Make changes if you know what you're doing."
} > distro.mak
if test "$HOST" != "$BUILD"; then
CC="${HOST}-gcc"
CXX="${HOST}-g++"
LD="${HOST}-ld"
RANLIB="${HOST}-ranlib"
AR="${HOST}-ar"
STRIP="${HOST}-strip"
} > "${distro_mak}"
if test "$TARGET" != "$BUILD"; then
CC="${TARGET}-gcc"
CXX="${TARGET}-g++"
LD="${TARGET}-ld"
RANLIB="${TARGET}-ranlib"
AR="${TARGET}-ar"
STRIP="${TARGET}-strip"
fi
case $HOST in
case $TARGET in
*powerpc*|*ppc*)
ARCH="ppc"
;;
......@@ -84,166 +114,154 @@ case $HOST in
ARCH="armel"
;;
esac
echo "ARCH = $ARCH" >> config.mak
add_makefile_cfg "ARCH = $ARCH"
# Check the HAVE_{OS}
case $HOST in
case $TARGET in
*darwin*)
echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "HAVE_BSD = 1" >> config.mak
add_makefile_cfg "HAVE_DARWIN_OS = 1"
add_makefile_cfg "HAVE_BSD = 1"
;;
*linux*)
echo "HAVE_LINUX = 1" >> config.mak
add_makefile_cfg "HAVE_LINUX = 1"
;;
*bsd*)
echo "HAVE_BSD = 1" >> config.mak
add_makefile_cfg "HAVE_BSD = 1"
;;
*wince*)
echo "HAVE_WINCE = 1" >> config.mak
add_makefile_cfg "HAVE_WINCE = 1"
;;
esac
case $HOST in
ppc-darwin)
# Mac OS X < 10.4
echo "Your version of Mac OS X is too old!" >&2
echo "Compiling VLC requires 10.5.x or later" >&2
exit 1
;;
*-apple-darwin8)
echo "Your version of Mac OS X is too old!" >&2
echo "Compiling and running VLC requires 10.5.x or later" >&2
case $TARGET in
ppc-darwin|*-apple-darwin8)
error "Your version of Mac OS X is too old!"
error "Compiling and running VLC requires 10.5.x or later"
exit 1
;;
powerpc-apple-darwin9)
SDK_TARGET=10.5
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
echo "HAVE_DARWIN_9 = 1" >> config.mak
DISTRO=darwin
HAVE_DARWIN_9=1
HAVE_DARWIN_32=1
SDK_TARGET=10.5
CFLAGS_TUNING=" -arch ppc -mtune=G4"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET} -Wl,-syslibroot,\${MACOSX_SDK}"
CC="/Developer/usr/bin/gcc-4.2"
CXX="/Developer/usr/bin/g++-4.2"
LD="ld -arch ppc -syslibroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
DISTRO=darwin
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
add_makefile_cfg "SDK_TARGET = ${SDK_TARGET}"
add_makefile_cfg "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}"
add_makefile_cfg "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk"
add_makefile_cfg "HAVE_DARWIN_9 = 1"
add_makefile_cfg "PATH = /bin:/usr/bin:/usr/local/bin:"
ensure_macosx_sdk_presence
;;
i686-apple-darwin*)
DISTRO=darwin
HAVE_DARWIN_9=1
HAVE_DARWIN_32=1
SDK_TARGET=10.5
MIN_LD_VERSION_WITH_TEXT_RELOCATION=81
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
echo "HAVE_DARWIN_9 = 1" >> config.mak
HAVE_DARWIN_9=1
if test `ld -v 2> /dev/stdout | sed -E 's/.*ld64-([0-9]+).*/\1/'` -lt ${MIN_LD_VERSION_WITH_TEXT_RELOCATION}; then
echo "ERROR: Your ld version is unable to compile VLC.\nUpdate to Xcode 3.1 or higher." >&2
error "Your ld version is unable to compile VLC.\nUpdate to Xcode 3.1 or higher."
exit 1
fi
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
HAVE_DARWIN_32=1
CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386 -m32"
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
CC="/Developer/usr/bin/gcc-4.2"
CXX="/Developer/usr/bin/g++-4.2"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
DISTRO=darwin
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
if test $HOST = "i686-apple-darwin10"; then
echo "HAVE_DARWIN_10 = 1" >> config.mak
add_makefile_cfg "PATH = /bin:/usr/bin:/usr/local/bin"
add_makefile_cfg "SDK_TARGET = ${SDK_TARGET}"
add_makefile_cfg "HAVE_DARWIN_OS_ON_INTEL = 1"
add_makefile_cfg "HAVE_DARWIN_9 = 1"
add_makefile_cfg "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}"
add_makefile_cfg "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk"
if test $TARGET = "i686-apple-darwin10"; then
add_makefile_cfg "HAVE_DARWIN_10 = 1"
fi
ensure_macosx_sdk_presence
;;
x86_64-apple-darwin*)
DISTRO=darwin64
SDK_TARGET=10.5
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
echo "HAVE_DARWIN_9 = 1" >> config.mak
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk" >> config.mak
HAVE_DARWIN_64=1
CFLAGS_TUNING=" -march=core2 -mtune=core2 -m64 -arch x86_64"
echo "HAVE_DARWIN_64 = 1" >> config.mak
EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
EXTRA_LDFLAGS=" -arch x86_64 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
CC="/Developer/usr/bin/gcc-4.2"
CXX="/Developer/usr/bin/g++-4.2"
LD="ld"
RANLIB="ranlib"
AR="ar"
STRIP="strip"
DISTRO=darwin64
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
if test $HOST = "x86_64-apple-darwin10"; then
echo "HAVE_DARWIN_10 = 1" >> config.mak
add_makefile_cfg "SDK_TARGET = ${SDK_TARGET}"
add_makefile_cfg "HAVE_DARWIN_OS_ON_INTEL = 1"
add_makefile_cfg "HAVE_DARWIN_9 = 1"
add_makefile_cfg "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}"
add_makefile_cfg "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk"
add_makefile_cfg "HAVE_DARWIN_64 = 1"
add_makefile_cfg "PATH = /bin:/usr/bin:/usr/local/bin"
if test $TARGET = "x86_64-apple-darwin10"; then
add_makefile_cfg "HAVE_DARWIN_10 = 1"
fi
ensure_macosx_sdk_presence
;;
*mingw32ce)
echo "HAVE_WINCE = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
add_makefile_cfg "HAVE_WINCE = 1"
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CPPFLAGS=" -D_WIN32_WCE=0x0500"
DISTRO=wince
;;
*64-*mingw*)
echo "HAVE_WIN64 = 1" >> config.mak
echo "HAVE_WIN32 = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
EXTRA_CFLAGS="-O3"
add_makefile_cfg "HAVE_WIN64 = 1"
add_makefile_cfg "HAVE_WIN32 = 1"
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CFLAGS="-O3"
DISTRO=win64
;;
*mingw32*)
echo "HAVE_WIN32 = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
add_makefile_cfg "HAVE_WIN32 = 1"
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CFLAGS=" -O3 -march=i686 -mtune=generic"
DISTRO=win32
;;
i686-pc-cygwin)
echo "HAVE_WIN32 = 1" >> config.mak
echo "HAVE_CYGWIN = 1" >> config.mak
add_makefile_cfg "HAVE_WIN32 = 1"
add_makefile_cfg "HAVE_CYGWIN = 1"
CC="gcc -mno-cygwin -isystem /usr/include/mingw"
CXX="g++ -mno-cygwin -isystem /usr/include/mingw"
HOST=`$CC -dumpmachine`
TARGET=`$CC -dumpmachine`
EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_LDFLAGS=" -mno-cygwin"
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
DISTRO=win32
;;
arm-wince-pe)
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
add_makefile_cfg "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig"
EXTRA_CPPFLAGS=" -D_WIN32_WCE"
DISTRO=wince
;;
armeb-linux-uclibc)
echo "HAVE_UCLIBC = 1" >> config.mak
echo "HAVE_BIGENDIAN = 1" >> config.mak
add_makefile_cfg "HAVE_UCLIBC = 1"
add_makefile_cfg "HAVE_BIGENDIAN = 1"
EXTRA_CFLAGS="-Os -march=armv5 -msoft-float"
;;
arm-none-linux-gnueabi)
if test -f /etc/maemo_version; then
DISTRO=maemo
echo 'HAVE_MAEMO = 1' >> config.mak
add_makefile_cfg 'HAVE_MAEMO = 1'
EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a"
EXTRA_CFLAGS="$EXTRA_CFLAGS -mfpu=neon -mfloat-abi=softfp"
EXTRA_CFLAGS="$EXTRA_CFLAGS -O3 -fno-tree-vectorize"
......@@ -255,19 +273,19 @@ case $HOST in
EXTRA_CFLAGS=" -fPIC"
EXTRA_CPPFLAGS=" -fPIC"
EXTRA_LDFLAGS=" -L/usr/lib64"
echo "LIBRARY_PATH = /usr/lib64" >> config.mak
echo "PKG_CONFIG_PATH = /usr/lib64/pkgconfig" >> config.mak
echo "PKG_CONFIG_LIBDIR = /usr/lib64/pkgconfig" >> config.mak
add_makefile_cfg "LIBRARY_PATH = /usr/lib64"
add_makefile_cfg "PKG_CONFIG_PATH = /usr/lib64/pkgconfig"
add_makefile_cfg "PKG_CONFIG_LIBDIR = /usr/lib64/pkgconfig"
;;
esac
if test -z "${DISTRO}" -a "$HOST" = "$BUILD"; then
if test -z "${DISTRO}" -a "$TARGET" = "$BUILD"; then
if test -d "/usr/lib/pkgconfig"; then
if test -z "$PKG_CONFIG_PATH"; then
echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
add_makefile_cfg "PKG_CONFIG_PATH = /usr/lib/pkgconfig"
fi
if test -z "$PKG_CONFIG_LIBDIR"; then
echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
add_makefile_cfg "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig"
fi
fi
# Try to match distribution
......@@ -275,7 +293,7 @@ if test -z "${DISTRO}" -a "$HOST" = "$BUILD"; then
DISTRO=fedora
elif test -f /etc/maemo_version; then
DISTRO=maemo
echo 'HAVE_MAEMO = 1' >> config.mak
add_makefile_cfg 'HAVE_MAEMO = 1'
elif test -f /etc/debian_version; then
# NOTE: check for Debian *after* its derivatives
DISTRO=debian
......@@ -285,97 +303,92 @@ fi
# Default Unix-like systems
test -z "${DISTRO}" && DISTRO=unix
cat src/Distributions/"${DISTRO}".mak >> distro.mak
cat src/Distributions/"${DISTRO}".mak >> "${distro_mak}"
echo "BUILD = $BUILD" >> config.mak
echo "HOST = $HOST" >> config.mak
add_makefile_cfg "BUILD = $BUILD"
add_makefile_cfg "HOST = $TARGET"
echo "PREFIX = `pwd`/hosts/$HOST" >> config.mak
add_makefile_cfg "PREFIX = `pwd`/hosts/$TARGET"
ln -sfn hosts/$HOST build
ln -sfn hosts/$TARGET build
echo "CC = ${CC}" >> config.mak
echo "CXX = ${CXX}" >> config.mak
echo "LD = ${LD}" >> config.mak
echo "RANLIB = ${RANLIB}" >> config.mak
echo "AR = ${AR}" >> config.mak
echo "STRIP = ${STRIP}" >> config.mak
echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.mak
echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
add_makefile_cfg "CC = ${CC}"
add_makefile_cfg "CXX = ${CXX}"
add_makefile_cfg "LD = ${LD}"
add_makefile_cfg "RANLIB = ${RANLIB}"
add_makefile_cfg "AR = ${AR}"
add_makefile_cfg "STRIP = ${STRIP}"
add_makefile_cfg "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}"
add_makefile_cfg "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include"
add_makefile_cfg "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}"
add_makefile_cfg "EXTRA_PATH = ${EXTRA_PATH}"
#CMAKE
if test "$HOST" != "$BUILD"; then
if test ${DISTRO} = "win32"; then
echo "SET(CMAKE_SYSTEM_NAME Windows)" >> toolchain.cmake
fi
echo "SET(CMAKE_C_COMPILER ${CC})" >> toolchain.cmake
echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> toolchain.cmake
echo "SET(CMAKE_FIND_ROOT_PATH `pwd` )" >> toolchain.cmake
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> toolchain.cmake
echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> toolchain.cmake
echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> toolchain.cmake
if test "$TARGET" != "$BUILD"; then
toolchain_cmake="${BUILDDIR}/toolchain.cmake"
if test ${DISTRO} = "win32"; then
echo "SET(CMAKE_SYSTEM_NAME Windows)" >> "${toolchain_cmake}"
fi
echo "SET(CMAKE_C_COMPILER ${CC})" >> "${toolchain_cmake}"
echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> "${toolchain_cmake}"
echo "SET(CMAKE_FIND_ROOT_PATH `pwd` )" >> "${toolchain_cmake}"
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> "${toolchain_cmake}"
echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> "${toolchain_cmake}"
echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> "${toolchain_cmake}"
fi
if wget --version >/dev/null 2>&1; then
echo "WGET = \"`which wget`\" -c --passive" >> config.mak
add_makefile_cfg "WGET = \"`which wget`\" -c --passive"
elif test -z `curl --version >/dev/null 2>&1`; then
echo "WGET = \"`which curl`\" -L -O" >> config.mak
add_makefile_cfg "WGET = \"`which curl`\" -L -O"
else
echo "You need at least wget or curl to fetch the packages." >&2
error "You need at least wget or curl to fetch the packages."
exit 1
fi
if svn --version >/dev/null 2>&1; then
echo "SVN = \"`which svn`\"" >> config.mak
add_makefile_cfg "SVN = \"`which svn`\""
else
echo "You do not have a subversion client in your PATH." >&2
error "You do not have a subversion client in your PATH."
fi
if git --version>/dev/null 2>&1; then
echo "GIT = \"`which git`\"" >> config.mak
add_makefile_cfg "GIT = \"`which git`\""
else
echo "You do not have a Git client in your PATH." >&2
error "You do not have a Git client in your PATH."
fi
if test -z "$CONTRIBS_RELEASE"; then
echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
set +x
echo
echo "*****************************************************************"
echo "* If you need contribs with all debug information, run this *"
echo "* line and compile the libraries on your own. *"
echo "* CONTRIBS_RELEASE=no ./bootstrap *"
echo "*****************************************************************"
add_makefile_cfg "EXTRA_CFLAGS += -DNDEBUG"
info "*****************************************************************"
info "* If you need contribs with all debug information, run this *"
info "* line and compile the libraries on your own. *"
info "* CONTRIBS_RELEASE=no ./bootstrap *"
info "*****************************************************************"
fi
if test $HAVE_DARWIN_9; then
if ! /Developer/usr/bin/gcc-4.2 --version>/dev/null 2>&1; then
echo "You do not have GCC-4.2 instelled, compilation WILL FAIL." >&2
error "You do not have GCC-4.2 instelled, compilation WILL FAIL."
fi
fi
if test $HAVE_DARWIN_32; then
set +x
echo
echo "*****************************************************************"
echo "* VLC will be compiled in 32bit mode. *"
echo "* *"
echo "* Re-run with the x86_64-apple-darwin* argument to turn on *"
echo "* 64bit compilation for Intel-based Macs, whereas * is either *"
echo "* 9 or 10 depending on your Darwin version. *"
echo "* There is NO PPC64 support right now. *"
echo "*****************************************************************"
info "*****************************************************************"
info "* VLC will be compiled in 32bit mode. *"
info "* *"
info "* Re-run with the x86_64-apple-darwin* argument to turn on *"
info "* 64bit compilation for Intel-based Macs, whereas * is either *"
info "* 9 or 10 depending on your Darwin version. *"
info "* There is NO PPC64 support right now. *"
info "*****************************************************************"
fi
if test $HAVE_DARWIN_64; then
set +x
echo
echo "*****************************************************************"
echo "* VLC will be compiled in 64bit mode using the 10.5 SDK. *"
echo "*****************************************************************"
set -x
info
info "*****************************************************************"
info "* VLC will be compiled in 64bit mode using the 10.5 SDK. *"
info "*****************************************************************"
fi
case `uname` in
......@@ -389,7 +402,6 @@ case `uname` in
CPUS=1 # default
;;
esac
echo "MAKEFLAGS += -j$CPUS" >> config.mak
add_makefile_cfg "MAKEFLAGS += -j$CPUS"
echo
echo "Using $CPUS processor(s)"
info "Using $CPUS processor(s)"
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