X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=1f38d6f745bf44739db308660b63271b4358eeff;hb=24ab0e75db887c2b1a412d00878810ed6501061e;hp=cf7b1bdb84b83ab18e0b5193ed5aada4aac41ddf;hpb=cbc37c5b89466abc620f5c41b8602d4db399936c;p=x264 diff --git a/configure b/configure index cf7b1bdb..1f38d6f7 100755 --- a/configure +++ b/configure @@ -1,33 +1,59 @@ #!/bin/bash if test x"$1" = x"-h" -o x"$1" = x"--help" ; then +cat <> config.log } +intel_cflags() { + # Intel Compiler issues an incredibly large number of warnings on any warning level, + # suppress them by disabling all warnings rather than having to use #pragmas to disable most of them + for arg in $*; do + [ $arg = -ffast-math ] && arg= + [[ "$arg" = -falign-loops* ]] && arg= + [ "$arg" = -fno-tree-vectorize ] && arg= + [ "$arg" = -Wshadow ] && arg= + [[ "$arg" = -mpreferred-stack-boundary* ]] && arg= + [[ "$arg" = -l* ]] && arg= + [[ "$arg" = -L* ]] && arg= + if [ $compiler = ICL ]; then + [ "$arg" = -Wall ] && arg=-W0 + [ "$arg" = -g ] && arg=-Z7 + [ "$arg" = -fomit-frame-pointer ] && arg= + [ "$arg" = -s ] && arg= + [ "$arg" = -fPIC ] && arg= + else + [ "$arg" = -Wall ] && arg=-w0 + fi + + [ -n "$arg" ] && echo -n "$arg " + done +} + +icl_ldflags() { + for arg in $*; do + arg=${arg/LIBPATH/libpath} + [ ${arg#-libpath:} == $arg -a ${arg#-l} != $arg ] && arg=${arg#-l}.lib + [ ${arg#-L} != $arg ] && arg=-libpath:${arg#-L} + [ $arg = -Wl,--large-address-aware ] && arg=-largeaddressaware + [ $arg = -s ] && arg= + [ "$arg" = -Wl,-Bsymbolic ] && arg= + + arg=${arg/pthreadGC/pthreadVC} + [ "$arg" = avifil32.lib ] && arg=vfw32.lib + [ "$arg" = gpac_static.lib ] && arg=libgpac_static.lib + + [ -n "$arg" ] && echo -n "$arg " + done +} + cc_check() { if [ -z "$3" ]; then if [ -z "$1$2" ]; then @@ -57,14 +125,23 @@ cc_check() { log_check "for $1" fi elif [ -z "$1" ]; then - log_check "whether $CC supports $3" + if [ -z "$2" ]; then + log_check "whether $CC supports $3" + else + log_check "whether $CC supports $3 with $2" + fi else log_check "for $3 in $1"; fi rm -f conftest.c [ -n "$1" ] && echo "#include <$1>" > conftest.c echo "int main () { $3 return 0; }" >> conftest.c - if $CC conftest.c $CFLAGS $2 $LDFLAGSCLI $LDFLAGS -o conftest >conftest.log 2>&1; then + if [ $compiler = ICL ]; then + cc_cmd="$CC conftest.c $(intel_cflags $CFLAGS $2) -link $(icl_ldflags $2 $LDFLAGSCLI $LDFLAGS)" + else + cc_cmd="$CC conftest.c $CFLAGS $2 $LDFLAGSCLI $LDFLAGS -o conftest" + fi + if $cc_cmd >conftest.log 2>&1; then res=$? log_ok else @@ -72,7 +149,7 @@ cc_check() { log_fail log_msg "Failed commandline was:" log_msg "--------------------------------------------------" - log_msg "$CC conftest.c $CFLAGS $2 $LDFLAGSCLI $LDFLAGS" + log_msg "$cc_cmd" cat conftest.log >> config.log log_msg "--------------------------------------------------" log_msg "Failed program was:" @@ -128,6 +205,33 @@ as_check() { return $res } +rc_check() { + log_check "whether $RC works" + echo "$1" > conftest.rc + if [ $compiler = ICL ]; then + rc_cmd="$RC $RCFLAGS -foconftest.o conftest.rc" + else + rc_cmd="$RC $RCFLAGS -o conftest.o conftest.rc" + fi + if $rc_cmd >conftest.log 2>&1; then + res=$? + log_ok + else + res=$? + log_fail + log_msg "Failed commandline was:" + log_msg "--------------------------------------------------" + log_msg "$rc_cmd" + cat conftest.log >> config.log + log_msg "--------------------------------------------------" + log_msg "Failed program was:" + log_msg "--------------------------------------------------" + cat conftest.rc >> config.log + log_msg "--------------------------------------------------" + fi + return $res +} + define() { echo "#define $1$([ -n "$2" ] && echo " $2" || echo " 1")" >> config.h } @@ -138,7 +242,12 @@ die() { exit 1 } -rm -f config.h config.mak config.log x264.pc conftest* +rm -f x264_config.h config.h config.mak config.log x264.pc x264.def conftest* + +SRCPATH="$(cd $(dirname $0); pwd)" +[ "$SRCPATH" = "$(pwd)" ] && SRCPATH=. +[ -n "$(echo $SRCPATH | grep ' ')" ] && die "Out of tree builds are impossible with whitespace in source path." +[ -e "$SRCPATH/config.h" -o -e "$SRCPATH/x264_config.h" ] && die "Out of tree builds are impossible with config.h/x264_config.h in source dir." prefix='/usr/local' exec_prefix='${prefix}' @@ -147,32 +256,43 @@ libdir='${exec_prefix}/lib' includedir='${prefix}/include' DEVNULL='/dev/null' +cli="yes" +cli_libx264="internal" +shared="no" +static="no" avs="auto" lavf="auto" ffms="auto" gpac="auto" +lsmash="auto" +mp4="no" gpl="yes" -pthread="auto" +thread="auto" swscale="auto" asm="auto" +interlaced="yes" debug="no" gprof="no" +strip="no" pic="no" -vis="no" -shared="no" bit_depth="8" +chroma_format="all" +compiler="GNU" +opencl="yes" -CFLAGS="$CFLAGS -Wall -I." +CFLAGS="$CFLAGS -Wall -I. -I\$(SRCPATH)" LDFLAGS="$LDFLAGS" LDFLAGSCLI="$LDFLAGSCLI" ASFLAGS="$ASFLAGS" +RCFLAGS="$RCFLAGS" HAVE_GETOPT_LONG=1 cross_prefix="" EXE="" # list of all preprocessor HAVE values we can define -CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON PTHREAD LOG2F VISUALIZE SWSCALE LAVF FFMS GPAC GF_MALLOC AVS GPL" +CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \ + LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH" # parse options @@ -194,9 +314,24 @@ for opt do --includedir=*) includedir="$optarg" ;; + --disable-cli) + cli="no" + ;; + --system-libx264) + cli_libx264="system" + ;; + --enable-shared) + shared="yes" + ;; + --enable-static) + static="yes" + ;; --disable-asm) asm="no" ;; + --disable-interlaced) + interlaced="no" + ;; --disable-avs) avs="no" ;; @@ -209,20 +344,29 @@ for opt do --disable-gpac) gpac="no" ;; + --disable-lsmash) + lsmash="no" + ;; --disable-gpl) gpl="no" ;; --extra-asflags=*) - ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}" + ASFLAGS="$ASFLAGS $optarg" ;; --extra-cflags=*) - CFLAGS="$CFLAGS ${opt#--extra-cflags=}" + CFLAGS="$CFLAGS $optarg" ;; --extra-ldflags=*) - LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}" + LDFLAGS="$LDFLAGS $optarg" + ;; + --extra-rcflags=*) + RCFLAGS="$RCFLAGS $optarg" ;; - --disable-pthread) - pthread="no" + --disable-thread) + thread="no" + ;; + --enable-win32thread) + thread="win32" ;; --disable-swscale) swscale="no" @@ -235,49 +379,59 @@ for opt do LDFLAGS="$LDFLAGS -pg" gprof="yes" ;; + --enable-strip) + strip="yes" + ;; --enable-pic) pic="yes" ;; - --enable-shared) - shared="yes" - ;; - --enable-visualize) - vis="yes" - ;; --host=*) - host="${opt#--host=}" + host="$optarg" + ;; + --disable-opencl) + opencl="no" ;; --cross-prefix=*) - cross_prefix="${opt#--cross-prefix=}" + cross_prefix="$optarg" ;; --sysroot=*) - CFLAGS="$CFLAGS --sysroot=${opt#--sysroot=}" - LDFLAGS="$LDFLAGS --sysroot=${opt#--sysroot=}" + CFLAGS="$CFLAGS --sysroot=$optarg" + LDFLAGS="$LDFLAGS --sysroot=$optarg" ;; --bit-depth=*) - bit_depth="${opt#--bit-depth=}" + bit_depth="$optarg" if [ "$bit_depth" -lt "8" -o "$bit_depth" -gt "10" ]; then echo "Supplied bit depth must be in range [8,10]." exit 1 fi bit_depth=`expr $bit_depth + 0` ;; + --chroma-format=*) + chroma_format="$optarg" + if [ $chroma_format != "420" -a $chroma_format != "422" -a $chroma_format != "444" -a $chroma_format != "all" ]; then + echo "Supplied chroma format must be 420, 422, 444 or all." + exit 1 + fi + ;; *) echo "Unknown option $opt, ignored" ;; esac done +[ "$cli" = "no" -a "$shared" = "no" -a "$static" = "no" ] && die "Nothing to build. Enable cli, shared or static." + CC="${CC-${cross_prefix}gcc}" AR="${AR-${cross_prefix}ar}" RANLIB="${RANLIB-${cross_prefix}ranlib}" STRIP="${STRIP-${cross_prefix}strip}" +INSTALL="${INSTALL-install}" if [ "x$host" = x ]; then - host=`./config.guess` + host=`${SRCPATH}/config.guess` fi # normalize a triplet into a quadruplet -host=`./config.sub $host` +host=`${SRCPATH}/config.sub $host` # split $host host_cpu="${host%%-*}" @@ -285,6 +439,27 @@ host="${host#*-}" host_vendor="${host%%-*}" host_os="${host#*-}" +# test for use of Intel Compiler +if [[ $host_os = mingw* || $host_os = cygwin* ]]; then + if [[ `basename "$CC"` = icl* ]]; then + # Windows Intel Compiler creates dependency generation with absolute Windows paths, Cygwin's make does not support Windows paths. + [[ $host_os = cygwin* ]] && die "Windows Intel Compiler support requires MSYS" + compiler=ICL + CFLAGS="$CFLAGS -Qstd=c99 -nologo -Qms0 -DHAVE_STRING_H -I\$(SRCPATH)/extras" + QPRE="-Q" + `$CC 2>&1 | grep -q IA-32` && host_cpu=i486 + `$CC 2>&1 | grep -q "Intel(R) 64"` && host_cpu=x86_64 + cpp_check "" "" "_MSC_VER >= 1400" || die "Windows Intel Compiler support requires Visual Studio 2005 or newer" + fi +else + if [[ `basename "$CC"` = icc* ]]; then + AR="xiar" + compiler=ICC + QPRE="-" + fi +fi + +libm="" case $host_os in beos*) SYS="BEOS" @@ -292,75 +467,132 @@ case $host_os in ;; darwin*) SYS="MACOSX" - CFLAGS="$CFLAGS -falign-loops=16" - LDFLAGS="$LDFLAGS -lm" + libm="-lm" if [ "$pic" = "no" ]; then cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" fi ;; freebsd*) SYS="FREEBSD" - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; kfreebsd*-gnu) SYS="FREEBSD" define HAVE_MALLOC_H - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; netbsd*) SYS="NETBSD" - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; openbsd*) SYS="OPENBSD" - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; *linux*) SYS="LINUX" define HAVE_MALLOC_H - LDFLAGS="$LDFLAGS -lm" + libm="-lm" + ;; + gnu*) + SYS="HURD" + define HAVE_MALLOC_H + libm="-lm" ;; cygwin*) - SYS="MINGW" EXE=".exe" - DEVNULL="NUL" if cc_check "" -mno-cygwin; then CFLAGS="$CFLAGS -mno-cygwin" LDFLAGS="$LDFLAGS -mno-cygwin" fi + if cpp_check "" "" "defined(__CYGWIN__)" ; then + define HAVE_MALLOC_H + SYS="CYGWIN" + else + SYS="WINDOWS" + DEVNULL="NUL" + LDFLAGSCLI="$LDFLAGSCLI -lshell32" + RC="${RC-${cross_prefix}windres}" + fi ;; mingw*) - SYS="MINGW" + SYS="WINDOWS" EXE=".exe" DEVNULL="NUL" + LDFLAGSCLI="$LDFLAGSCLI -lshell32" + [ $compiler = ICL ] && RC="${RC-rc}" || RC="${RC-${cross_prefix}windres}" ;; sunos*|solaris*) SYS="SunOS" define HAVE_MALLOC_H - LDFLAGS="$LDFLAGS -lm" + libm="-lm" + if cc_check "" /usr/lib/64/values-xpg6.o; then + LDFLAGS="$LDFLAGS /usr/lib/64/values-xpg6.o" + else + LDFLAGS="$LDFLAGS /usr/lib/values-xpg6.o" + fi + if test -x /usr/ucb/install ; then + INSTALL=/usr/ucb/install + elif test -x /usr/bin/ginstall ; then + # OpenSolaris + INSTALL=/usr/bin/ginstall + elif test -x /usr/gnu/bin/install ; then + # OpenSolaris + INSTALL=/usr/gnu/bin/install + fi HAVE_GETOPT_LONG=0 ;; + *qnx*) + SYS="QNX" + define HAVE_MALLOC_H + libm="-lm" + HAVE_GETOPT_LONG=0 + CFLAGS="$CFLAGS -I\$(SRCPATH)/extras" + ;; *) die "Unknown system $host, edit the configure" ;; esac +LDFLAGS="$LDFLAGS $libm" + +stack_alignment=16 case $host_cpu in i*86) ARCH="X86" AS="yasm" ASFLAGS="$ASFLAGS -O2" - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then - CFLAGS="$CFLAGS -march=i686" - fi - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then - CFLAGS="$CFLAGS -mfpmath=sse -msse" + if [ $compiler = GNU ]; then + if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then + CFLAGS="$CFLAGS -march=i686" + fi + if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then + CFLAGS="$CFLAGS -mfpmath=sse -msse" + fi + CFLAGS="-m32 $CFLAGS" + LDFLAGS="-m32 $LDFLAGS" + else + # icc on linux has various degrees of mod16 stack support + if [ $SYS = LINUX ]; then + # < 11 is completely incapable of keeping a mod16 stack + if cpp_check "" "" "__INTEL_COMPILER < 1100" ; then + stack_alignment=4 + # 11 <= x < 12 is capable of keeping a mod16 stack, but defaults to not doing so. + elif cpp_check "" "" "__INTEL_COMPILER < 1200" ; then + CFLAGS="$CFLAGS -falign-stack=assume-16-byte" + fi + # >= 12 defaults to a mod16 stack + fi + # icl on windows has no mod16 stack support + [ $SYS = WINDOWS ] && stack_alignment=4 fi if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho -DPREFIX" - elif [ "$SYS" = MINGW ]; then + elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then ASFLAGS="$ASFLAGS -f win32 -DPREFIX" LDFLAGS="$LDFLAGS -Wl,--large-address-aware" + [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" + [ $compiler = GNU ] && RCFLAGS="--target=pe-i386 $RCFLAGS" else ASFLAGS="$ASFLAGS -f elf" fi @@ -368,15 +600,19 @@ case $host_cpu in x86_64) ARCH="X86_64" AS="yasm" - if [ "$SYS" = MACOSX ];then + [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" + if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" if cc_check '' "-arch x86_64"; then CFLAGS="$CFLAGS -arch x86_64" LDFLAGS="$LDFLAGS -arch x86_64" fi - elif [ "$SYS" = MINGW ]; then + elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then ASFLAGS="$ASFLAGS -f win32 -m amd64" - cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX" + # only the GNU toolchain is inconsistent in prefixing function names with _ + [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX" + [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" + [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" else ASFLAGS="$ASFLAGS -f elf -m amd64" fi @@ -430,17 +666,26 @@ case $host_cpu in s390|s390x) ARCH="S390" ;; - parisc|parisc64) + hppa*|parisc*) ARCH="PARISC" ;; ia64) ARCH="IA64" ;; + alpha*) + ARCH="ALPHA" + ;; *) ARCH="$(echo $host_cpu | tr a-z A-Z)" ;; esac +if [ $SYS = WINDOWS ]; then + if ! rc_check "0 RCDATA {0}" ; then + RC="" + fi +fi + log_msg "x264 configure script" if [ -n "$*" ]; then msg="Command line options:" @@ -455,38 +700,47 @@ log_msg "" cc_check || die "No working C compiler found." -if cc_check '' -std=gnu99 ; then - CFLAGS="$CFLAGS -std=gnu99" -elif cc_check '' -std=c99 ; then - CFLAGS="$CFLAGS -std=c99 -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE" +if [ $compiler != ICL ]; then + if cc_check '' -std=gnu99 'for( int i = 0; i < 9; i++ );' ; then + CFLAGS="$CFLAGS -std=gnu99" + elif cc_check '' -std=c99 'for( int i = 0; i < 9; i++ );' ; then + CFLAGS="$CFLAGS -std=c99 -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE" + elif ! cc_check '' '' 'for( int i = 0; i < 9; i++ );' ; then + die "C99 compiler is needed for compilation." + fi fi -if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o $ARCH = "ARM" -o $ARCH = "IA64" \) ] ; then +if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o $ARCH = "ARM" -o $ARCH = "IA64" -o $ARCH = "PARISC" -o $ARCH = "MIPS" -o $ARCH = "AARCH64" \) ] ; then pic="yes" fi if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then - if ! as_check "lzcnt eax, eax" ; then - VER=`($AS --version || echo no assembler) 2>$DEVNULL | head -n 1` + if ! as_check "vpmovzxwd ymm0, xmm0" ; then + VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1` echo "Found $VER" - echo "Minimum version is yasm-0.6.2" + echo "Minimum version is yasm-1.2.0" echo "If you really want to compile without asm, configure with --disable-asm." exit 1 fi if ! cc_check '' '' '__asm__("pabsw %xmm0, %xmm0");' ; then - VER=`(as --version || echo no gnu as) 2>$DEVNULL | head -n 1` + VER=`(${cross_prefix}as --version || echo no gnu as) 2>/dev/null | head -n 1` echo "Found $VER" echo "Minimum version is binutils-2.17" echo "Your compiler can't handle inline SSSE3 asm." echo "If you really want to compile without asm, configure with --disable-asm." exit 1 fi + ASFLAGS="$ASFLAGS -Worphan-labels" define HAVE_MMX + if [ $compiler = GNU ] && cc_check '' -mpreferred-stack-boundary=5 ; then + CFLAGS="$CFLAGS -mpreferred-stack-boundary=5" + stack_alignment=32 + fi fi if [ $asm = auto -a $ARCH = ARM ] ; then # set flags so neon is built by default - echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-mfloat-abi)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp" + echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 @@ -505,124 +759,135 @@ fi define ARCH_$ARCH define SYS_$SYS -echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c -$CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed" -if (strings -a conftest.o | grep -q BIGE) && (strings -a conftest.o | grep -q FPendian) ; then - define WORDS_BIGENDIAN -elif !(strings -a conftest.o | grep -q EGIB && strings -a conftest.o | grep -q naidnePF) ; then - die "endian test failed" +define STACK_ALIGNMENT $stack_alignment +ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$stack_alignment" + +# skip endianness check for Intel Compiler, as all supported platforms are little. the -ipo flag will also cause the check to fail +if [ $compiler = GNU ]; then + echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c + $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed" + if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then + define WORDS_BIGENDIAN + elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then + die "endian test failed" + fi fi # autodetect options that weren't forced nor disabled +# pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows +[ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32" + libpthread="" -if test "$pthread" = "auto" ; then - pthread="no" +if [ "$thread" = "auto" ]; then + thread="no" case $SYS in BEOS) - pthread="yes" + thread="beos" + define HAVE_BEOSTHREAD ;; - MINGW) + WINDOWS) if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then - pthread="yes" + thread="posix" libpthread="-lpthread" elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then - pthread="yes" + thread="posix" libpthread="-lpthreadGC2" elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then - pthread="yes" + thread="posix" libpthread="-lpthreadGC2 -lwsock32" define PTW32_STATIC_LIB elif cc_check pthread.h "-lpthreadGC2 -lws2_32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then - pthread="yes" + thread="posix" libpthread="-lpthreadGC2 -lws2_32" define PTW32_STATIC_LIB + else + # default to native threading if pthread-win32 is unavailable + thread="win32" fi ;; - OPENBSD) - cc_check pthread.h -pthread && pthread="yes" && libpthread="-pthread" + QNX) + cc_check pthread.h -lc "pthread_create(0,0,0,0);" && thread="posix" && libpthread="-lc" ;; *) - cc_check pthread.h -lpthread && pthread="yes" && libpthread="-lpthread" + if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then + thread="posix" + libpthread="-lpthread" + else + cc_check pthread.h "" "pthread_create(0,0,0,0);" && thread="posix" && libpthread="" + fi ;; esac fi -if test "$pthread" = "yes" ; then - define HAVE_PTHREAD +if [ "$thread" = "posix" ]; then LDFLAGS="$LDFLAGS $libpthread" + define HAVE_POSIXTHREAD + if [ "$SYS" = "LINUX" ] && cc_check sched.h "-D_GNU_SOURCE -Werror" "cpu_set_t p_aff; return CPU_COUNT(&p_aff);" ; then + define HAVE_CPU_COUNT + fi fi +if [ "$thread" = "win32" ]; then + # cygwin does not support win32 threads + if [ "$SYS" = "WINDOWS" ]; then + define HAVE_WIN32THREAD + else + thread="no" + fi +fi +[ "$thread" != "no" ] && define HAVE_THREAD if cc_check "math.h" "-Werror" "return log2f(2);" ; then define HAVE_LOG2F fi -if [ "$vis" = "yes" ] ; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I/usr/X11R6/include" - if cc_check "X11/Xlib.h" "-L/usr/X11R6/lib -lX11" "XOpenDisplay(0);" ; then - LDFLAGS="-L/usr/X11R6/lib -lX11 $LDFLAGS" - define HAVE_VISUALIZE - else - vis="no" - CFLAGS="$save_CFLAGS" - fi +if [ "$SYS" = "LINUX" -a \( "$ARCH" = "X86" -o "$ARCH" = "X86_64" \) ] && cc_check "sys/mman.h" "" "MADV_HUGEPAGE;" ; then + define HAVE_THP fi if [ "$swscale" = "auto" ] ; then swscale="no" - if ${cross_prefix}pkg-config --exists libswscale 2>$DEVNULL; then - SWSCALE_LIBS="$SWSCALE_LIBS $(${cross_prefix}pkg-config --libs libswscale)" - SWSCALE_CFLAGS="$SWSCALE_CFLAGS $(${cross_prefix}pkg-config --cflags libswscale)" + if ${cross_prefix}pkg-config --exists libswscale 2>/dev/null; then + SWSCALE_LIBS="$SWSCALE_LIBS $(${cross_prefix}pkg-config --libs libswscale libavutil)" + SWSCALE_CFLAGS="$SWSCALE_CFLAGS $(${cross_prefix}pkg-config --cflags libswscale libavutil)" fi [ -z "$SWSCALE_LIBS" ] && SWSCALE_LIBS="-lswscale -lavutil" - error="swscale must be at least version 0.9.0" - if cc_check "libswscale/swscale.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "sws_getContext(0,0,0,0,0,0,0,0,0,0);" ; then - if cpp_check "libswscale/swscale.h" "$SWSCALE_CFLAGS" "LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0,9,0)" "$error"; then - # we use colorspaces that were defined in libavutil r19775 - if cc_check "libavutil/pixfmt.h" "$SWSCALE_CFLAGS" "enum PixelFormat pixfmt = PIX_FMT_YUV422P16LE;" ; then - swscale="yes" - else - echo "Warning: libavutil is too old, update to ffmpeg r19775+" - fi + if cc_check "libswscale/swscale.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "sws_init_context(0,0,0);" ; then + if cpp_check "libavutil/pixdesc.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "defined(AV_PIX_FMT_FLAG_RGB)" ; then + swscale="yes" else - echo "Warning: ${error}" + echo "Warning: AV_PIX_FMT_FLAG_RGB is missing from libavutil, update for swscale support" fi fi fi if [ "$lavf" = "auto" ] ; then lavf="no" - if ${cross_prefix}pkg-config --exists libavformat libavcodec libswscale 2>$DEVNULL; then + if ${cross_prefix}pkg-config --exists libavformat libavcodec libswscale 2>/dev/null; then LAVF_LIBS="$LAVF_LIBS $(${cross_prefix}pkg-config --libs libavformat libavcodec libavutil libswscale)" LAVF_CFLAGS="$LAVF_CFLAGS $(${cross_prefix}pkg-config --cflags libavformat libavcodec libavutil libswscale)" fi if [ -z "$LAVF_LIBS" -a -z "$LAVF_CFLAGS" ]; then LAVF_LIBS="-lavformat" - for lib in -lpostproc -lavcodec -lavcore -lswscale -lavutil -lm -lz -lbz2 $libpthread -lavifil32; do + for lib in -lpostproc -lavcodec -lavcore -lswscale -lavutil -lm -lz -lbz2 $libpthread -lavifil32 -lws2_32; do cc_check "" $lib && LAVF_LIBS="$LAVF_LIBS $lib" done fi LAVF_LIBS="-L. $LAVF_LIBS" - if cc_check libavformat/avformat.h "$LAVF_CFLAGS $LAVF_LIBS" "avcodec_decode_video2(0,0,0,0);" ; then - # libvautil/pixdesc.h included the private header intreadwrite.h until r21854 - if cc_check libavutil/pixdesc.h "$LAVF_CFLAGS $LAVF_LIBS" ; then - if [ "$swscale" = "yes" ]; then - lavf="yes" - else - echo "Warning: libavformat is not supported without swscale support" - fi + if cc_check libavformat/avformat.h "$LAVF_CFLAGS $LAVF_LIBS" "avformat_close_input(0);" ; then + if [ "$swscale" = "yes" ]; then + lavf="yes" else - echo "Warning: libavutil is too old, update to ffmpeg r21854+" + echo "Warning: libavformat is not supported without swscale support" fi fi fi if [ "$ffms" = "auto" ] ; then - ffms_major="2"; ffms_minor="14"; ffms_micro="0"; ffms_bump="0" + ffms_major="2"; ffms_minor="16"; ffms_micro="2"; ffms_bump="0" ffms="no" - if ${cross_prefix}pkg-config --exists ffms2 2>$DEVNULL; then + if ${cross_prefix}pkg-config --exists ffms2 2>/dev/null; then FFMS2_LIBS="$FFMS2_LIBS $(${cross_prefix}pkg-config --libs ffms2)" FFMS2_CFLAGS="$FFMS2_CFLAGS $(${cross_prefix}pkg-config --cflags ffms2)" fi @@ -655,19 +920,38 @@ if [ "$swscale" = "yes" ]; then CFLAGS="$CFLAGS $LAVF_CFLAGS" define HAVE_LAVF fi - if [ "ffms" = "yes" ]; then + if [ "$ffms" = "yes" ]; then LDFLAGSCLI="$FFMS2_LIBS $LDFLAGSCLI" CFLAGS="$CFLAGS $FFMS2_CFLAGS" define HAVE_FFMS fi fi -GPAC_LIBS="-lgpac_static" -if [ $SYS = MINGW ]; then - GPAC_LIBS="$GPAC_LIBS -lwinmm" +if [ "$lsmash" = "auto" ] ; then + lsmash="no" + if ${cross_prefix}pkg-config --exists liblsmash 2>/dev/null; then + LSMASH_LIBS="$LSMASH_LIBS $(${cross_prefix}pkg-config --libs liblsmash)" + LSMASH_CFLAGS="$LSMASH_CFLAGS $(${cross_prefix}pkg-config --cflags liblsmash)" + fi + [ -z "$LSMASH_LIBS" ] && LSMASH_LIBS="-llsmash" + + if cc_check lsmash.h "$LSMASH_CFLAGS $LSMASH_LIBS" ; then + if cpp_check lsmash.h "$LSMASH_CFLAGS" "LSMASH_VERSION_MAJOR > 0 || (LSMASH_VERSION_MAJOR == 0 && LSMASH_VERSION_MINOR >= 1)" ; then + lsmash="yes" + else + echo "Warning: lsmash is too old, update to rev.751 or later" + fi + fi fi -if [ "$gpac" = "auto" ] ; then + +if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then gpac="no" + GPAC_LIBS="-lgpac_static" + cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" + if [ "$SYS" = "WINDOWS" ] ; then + cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32" + cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm" + fi if cc_check gpac/isomedia.h "$GPAC_LIBS" ; then if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then gpac="yes" @@ -676,31 +960,50 @@ if [ "$gpac" = "auto" ] ; then fi fi fi -if [ "$gpac" = "yes" ] ; then + +if [ "$lsmash" = "yes" ] ; then + mp4="lsmash" + LDFLAGSCLI="$LSMASH_LIBS $LDFLAGSCLI" + CFLAGS="$CFLAGS $LSMASH_CFLAGS" + define HAVE_LSMASH +elif [ "$gpac" = "yes" ] ; then + mp4="gpac" define HAVE_GPAC - if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "gf_malloc(1); gf_free(NULL);" ; then - define HAVE_GF_MALLOC - fi LDFLAGSCLI="$GPAC_LIBS $LDFLAGSCLI" fi if [ "$avs" = "auto" ] ; then avs="no" - if [ $SYS = MINGW ] && cc_check extras/avisynth_c.h ; then - avs="yes" + # cygwin can use avisynth if it can use LoadLibrary + if [ $SYS = WINDOWS ] || ([ $SYS = CYGWIN ] && cc_check windows.h "" "LoadLibraryW(0);") ; then + avs="avisynth" define HAVE_AVS + define USE_AVXSYNTH 0 + elif [ "$SYS" = "LINUX" -o "$SYS" = "MACOSX" ] ; then + # AvxSynth currently only supports Linux and OSX + avs="avxsynth" + define HAVE_AVS + define USE_AVXSYNTH 1 + AVS_LIBS="-ldl" + LDFLAGSCLI="$AVS_LIBS $LDFLAGSCLI" fi fi +cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT + if [ "$pic" = "yes" ] ; then CFLAGS="$CFLAGS -fPIC" ASFLAGS="$ASFLAGS -DPIC" # resolve textrels in the x86 asm - cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" + cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic" + [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" fi if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then - CFLAGS="$CFLAGS -s -fomit-frame-pointer" + CFLAGS="$CFLAGS -fomit-frame-pointer" +fi + +if [ "$strip" = "yes" ]; then LDFLAGS="$LDFLAGS -s" fi @@ -718,12 +1021,20 @@ if cc_check '' -fno-tree-vectorize ; then CFLAGS="$CFLAGS -fno-tree-vectorize" fi +if [ $SYS = WINDOWS -a $ARCH = X86 -a $compiler = GNU ] ; then + # workaround gcc/ld bug with alignment of static variables/arrays that are initialized to zero + cc_check '' -fno-zero-initialized-in-bss && CFLAGS="$CFLAGS -fno-zero-initialized-in-bss" +fi + if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then define fseek fseeko define ftell ftello elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then define fseek fseeko64 define ftell ftello64 +elif cc_check "stdio.h" "" "_fseeki64(stdin,0,0);" ; then + define fseek _fseeki64 + define ftell _ftelli64 fi if cc_check '' -Wshadow ; then @@ -732,24 +1043,109 @@ fi if [ "$bit_depth" -gt "8" ]; then define HIGH_BIT_DEPTH - ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH" + ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=1" + opencl="no" +else + ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=0" +fi + +if [ "$chroma_format" != "all" ]; then + define CHROMA_FORMAT CHROMA_$chroma_format fi -define BIT_DEPTH $bit_depth ASFLAGS="$ASFLAGS -DBIT_DEPTH=$bit_depth" -[ $gpl = yes ] && define HAVE_GPL +[ $gpl = yes ] && define HAVE_GPL && x264_gpl=1 || x264_gpl=0 + +[ $interlaced = yes ] && define HAVE_INTERLACED && x264_interlaced=1 || x264_interlaced=0 + +libdl="" +if [ "$opencl" = "yes" ]; then + opencl="no" + log_check "for perl" + output=$(perl -v) + if [ "$output" = "" ]; then + log_fail + echo 'OpenCL support requires perl to compile.' + echo 'use --disable-opencl to compile without OpenCL.' + exit 1 + fi + log_ok + # cygwin can use opencl if it can use LoadLibrary + if [ $SYS = WINDOWS ] || ([ $SYS = CYGWIN ] && cc_check windows.h "" "LoadLibraryW(0);") ; then + opencl="yes" + define HAVE_OPENCL + elif [ "$SYS" = "LINUX" -o "$SYS" = "MACOSX" ] ; then + opencl="yes" + define HAVE_OPENCL + libdl="-ldl" + fi + LDFLAGS="$LDFLAGS $libdl" +fi #define undefined vars as 0 for var in $CONFIG_HAVE; do grep -q "HAVE_$var 1" config.h || define HAVE_$var 0 done +if [ $compiler = ICL ]; then + AR="xilib -nologo -out:" + DEPMM=-QMM + DEPMT=-QMT + HAVE_GETOPT_LONG=0 + LD="xilink -out:" + LDFLAGS="-nologo -incremental:no $(icl_ldflags $LDFLAGS)" + LDFLAGSCLI="$(icl_ldflags $LDFLAGSCLI)" + LIBX264=libx264.lib + RANLIB= + [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -I\$(SRCPATH)/extras -fo" + STRIP= + if [ $debug = yes ]; then + LDFLAGS="-debug $LDFLAGS" + CFLAGS="-D_DEBUG $CFLAGS" + else + CFLAGS="-DNDEBUG $CFLAGS" + fi +else + AR="$AR rc " + DEPMM="-MM -g0" + DEPMT="-MT" + LD="$CC -o " + LIBX264=libx264.a + [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o " +fi +if [ $compiler = GNU ]; then + PROF_GEN_CC="-fprofile-generate" + PROF_GEN_LD="-fprofile-generate" + PROF_USE_CC="-fprofile-use" + PROF_USE_LD="-fprofile-use" +else + CFLAGS="$(intel_cflags $CFLAGS)" + # icc does not define __SSE__ until SSE2 optimization and icl never defines it or _M_IX86_FP + [ \( $ARCH = X86_64 -o $ARCH = X86 \) -a $asm = yes ] && ! cpp_check "" "" "defined(__SSE__)" && define __SSE__ + PROF_GEN_CC="${QPRE}prof-gen ${QPRE}prof-dir." + PROF_GEN_LD= + PROF_USE_CC="${QPRE}prof-use ${QPRE}prof-dir." + PROF_USE_LD= +fi + rm -f conftest* +# generate exported config file + +config_chroma_format="X264_CSP_I$chroma_format" +[ "$config_chroma_format" == "X264_CSP_Iall" ] && config_chroma_format="0" +cat > x264_config.h << EOF +#define X264_BIT_DEPTH $bit_depth +#define X264_GPL $x264_gpl +#define X264_INTERLACED $x264_interlaced +#define X264_CHROMA_FORMAT $config_chroma_format +EOF + # generate config files cat > config.mak << EOF +SRCPATH=$SRCPATH prefix=$prefix exec_prefix=$exec_prefix bindir=$bindir @@ -759,43 +1155,95 @@ ARCH=$ARCH SYS=$SYS CC=$CC CFLAGS=$CFLAGS +DEPMM=$DEPMM +DEPMT=$DEPMT +LD=$LD LDFLAGS=$LDFLAGS -LDFLAGSCLI=$LDFLAGSCLI +LIBX264=$LIBX264 AR=$AR RANLIB=$RANLIB STRIP=$STRIP +INSTALL=$INSTALL AS=$AS ASFLAGS=$ASFLAGS +RC=$RC +RCFLAGS=$RCFLAGS EXE=$EXE HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG DEVNULL=$DEVNULL +PROF_GEN_CC=$PROF_GEN_CC +PROF_GEN_LD=$PROF_GEN_LD +PROF_USE_CC=$PROF_USE_CC +PROF_USE_LD=$PROF_USE_LD +HAVE_OPENCL=$opencl EOF +if [ $compiler = ICL ]; then + echo '%.o: %.c' >> config.mak + echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak +fi + +if [ "$cli" = "yes" ]; then + echo 'default: cli' >> config.mak + echo 'install: install-cli' >> config.mak +fi + if [ "$shared" = "yes" ]; then - API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') - if [ "$SYS" = "MINGW" ]; then + API=$(grep '#define X264_BUILD' < ${SRCPATH}/x264.h | cut -f 3 -d ' ') + if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then echo "SONAME=libx264-$API.dll" >> config.mak - echo 'IMPLIBNAME=libx264.dll.a' >> config.mak - echo 'SOFLAGS=-Wl,--out-implib,$(IMPLIBNAME) -Wl,--enable-auto-image-base' >> config.mak + if [ $compiler = ICL ]; then + echo 'IMPLIBNAME=libx264.dll.lib' >> config.mak + # GNU ld on windows defaults to exporting all global functions if there are no explicit __declspec(dllexport) declarations + # MSVC link does not act similarly, so it is required to make an export definition out of x264.h and use it at link time + echo "SOFLAGS=-dll -def:x264.def -implib:\$(IMPLIBNAME) $SOFLAGS" >> config.mak + echo "EXPORTS" > x264.def + # export API functions + grep "^\(int\|void\|x264_t\).*x264" ${SRCPATH}/x264.h | sed -e "s/.*\(x264.*\)(.*/\1/;s/open/open_$API/g" >> x264.def + # export API variables/data. must be flagged with the DATA keyword + grep "extern.*x264" ${SRCPATH}/x264.h | sed -e "s/.*\(x264\w*\)\W.*/\1 DATA/;" >> x264.def + else + echo 'IMPLIBNAME=libx264.dll.a' >> config.mak + echo "SOFLAGS=-shared -Wl,--out-implib,\$(IMPLIBNAME) -Wl,--enable-auto-image-base $SOFLAGS" >> config.mak + fi elif [ "$SYS" = "MACOSX" ]; then echo "SOSUFFIX=dylib" >> config.mak echo "SONAME=libx264.$API.dylib" >> config.mak - echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAME)' >> config.mak + echo "SOFLAGS=-shared -dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress -install_name \$(DESTDIR)\$(libdir)/\$(SONAME) $SOFLAGS" >> config.mak elif [ "$SYS" = "SunOS" ]; then echo "SOSUFFIX=so" >> config.mak echo "SONAME=libx264.so.$API" >> config.mak - echo 'SOFLAGS=-Wl,-h,$(SONAME)' >> config.mak + echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak else echo "SOSUFFIX=so" >> config.mak echo "SONAME=libx264.so.$API" >> config.mak - echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak + echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> config.mak fi - echo 'default: $(SONAME)' >> config.mak + echo 'default: lib-shared' >> config.mak + echo 'install: install-lib-shared' >> config.mak fi -./version.sh >> config.h +if [ "$static" = "yes" ]; then + echo 'default: lib-static' >> config.mak + echo 'install: install-lib-static' >> config.mak +fi -pclibs="-L$libdir -lx264 $libpthread" +if [ "$cli_libx264" = "system" ] ; then + if [ "$shared" = "yes" ]; then + CLI_LIBX264='$(SONAME)' + elif ${cross_prefix}pkg-config --exists x264 2>/dev/null; then + LDFLAGSCLI="$LDFLAGSCLI $(${cross_prefix}pkg-config --libs x264)" + CLI_LIBX264= + else + die "Can not find system libx264" + fi +else + CLI_LIBX264='$(LIBX264)' +fi +echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak +echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak + +${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h cat > x264.pc << EOF prefix=$prefix @@ -805,8 +1253,9 @@ includedir=$includedir Name: x264 Description: H.264 (MPEG4 AVC) encoder library -Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//') -Libs: $pclibs +Version: $(grep POINTVER < x264_config.h | sed -e 's/.* "//; s/".*//') +Libs: -L$libdir -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl) +Libs.private: $([ "$shared" = "yes" ] && echo $libpthread $libm $libdl) Cflags: -I$includedir EOF @@ -816,22 +1265,28 @@ gpl_filters="" [ $gpl = yes ] && filters="$filters $gpl_filters" cat > conftest.log <> config.log @@ -839,6 +1294,9 @@ cat conftest.log >> config.log cat conftest.log rm conftest.log +[ "$SRCPATH" != "." ] && ln -sf ${SRCPATH}/Makefile ./Makefile +mkdir -p common/{arm,ppc,sparc,x86} encoder extras filters/video input output tools + echo echo "You can run 'make' or 'make fprofiled' now."