X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=741f6d69e87dcb787bd4caa7ba0279d2917fc7d7;hb=1ce062abb47ac59621b402cb26a1f14c91bb52bc;hp=02fe4be3fc4410641f1ba3cbc69893d871338b53;hpb=8797e0f8d416aadb91d359f144e4e7855071870a;p=x264 diff --git a/configure b/configure index 02fe4be3..741f6d69 100755 --- a/configure +++ b/configure @@ -28,7 +28,7 @@ Configuration options: --disable-opencl disable OpenCL features --disable-gpl disable GPL-only features --disable-thread disable multithreaded encoding - --enable-win32thread use win32threads (windows only) + --disable-win32thread disable win32threads (windows only) --disable-interlaced disable interlaced encoding support --bit-depth=BIT_DEPTH set output bit depth (8-10) [8] --chroma-format=FORMAT output chroma format (420, 422, 444, all) [all] @@ -74,10 +74,9 @@ log_msg() { } cc_cflags() { - # several non gcc compilers issue 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 + # several non gcc compilers issue an incredibly large number of warnings on high warning levels, + # suppress them by reducing the warning level rather than having to use #pragmas for arg in $*; do - [ $arg = -ffast-math ] && arg= [[ "$arg" = -falign-loops* ]] && arg= [ "$arg" = -fno-tree-vectorize ] && arg= [ "$arg" = -Wshadow ] && arg= @@ -86,14 +85,16 @@ cc_cflags() { [[ "$arg" = -l* ]] && arg= [[ "$arg" = -L* ]] && arg= if [ $compiler_style = MS ]; then - [ "$arg" = -Wall ] && arg=-W0 + [ "$arg" = -ffast-math ] && arg="-fp:fast" + [ "$arg" = -Wall ] && arg= [ "$arg" = -Werror ] && arg="-W3 -WX" [ "$arg" = -g ] && arg=-Z7 [ "$arg" = -fomit-frame-pointer ] && arg= [ "$arg" = -s ] && arg= [ "$arg" = -fPIC ] && arg= else - [ "$arg" = -Wall ] && arg=-w0 + [ "$arg" = -ffast-math ] && arg= + [ "$arg" = -Wall ] && arg= [ "$arg" = -Werror ] && arg="-w3 -Werror" fi [ $compiler = CL -a "$arg" = -O3 ] && arg=-O2 @@ -105,10 +106,10 @@ cc_cflags() { cl_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#-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" = -fno-tree-vectorize ] && arg= [ "$arg" = -Werror ] && arg= @@ -119,6 +120,7 @@ cl_ldflags() { arg=${arg/pthreadGC/pthreadVC} [ "$arg" = avifil32.lib ] && arg=vfw32.lib [ "$arg" = gpac_static.lib ] && arg=libgpac_static.lib + [ "$arg" = x264.lib ] && arg=libx264.lib [ -n "$arg" ] && echo -n "$arg " done @@ -143,7 +145,9 @@ cc_check() { log_check "for $3 in $1"; fi rm -f conftest.c - [ -n "$1" ] && echo "#include <$1>" > conftest.c + for arg in $1; do + echo "#include <$arg>" >> conftest.c + done echo "int main (void) { $3 return 0; }" >> conftest.c if [ $compiler_style = MS ]; then cc_cmd="$CC conftest.c $(cc_cflags $CFLAGS $CHECK_CFLAGS $2) -link $(cl_ldflags $2 $LDFLAGSCLI $LDFLAGS)" @@ -172,7 +176,9 @@ cc_check() { cpp_check() { log_check "whether $3 is true" rm -f conftest.c - [ -n "$1" ] && echo "#include <$1>" > conftest.c + for arg in $1; do + echo "#include <$arg>" >> conftest.c + done echo -e "#if !($3) \n#error $4 \n#endif " >> conftest.c if [ $compiler_style = MS ]; then cpp_cmd="$CC conftest.c $(cc_cflags $CFLAGS $2) -P" @@ -256,11 +262,66 @@ die() { exit 1 } +configure_system_override() { + log_check "system libx264 configuration" + x264_config_path="$1/x264_config.h" + if [ -e "$x264_config_path" ]; then + res=$? + log_ok + arg="$(grep '#define X264_GPL ' $x264_config_path | sed -e 's/#define X264_GPL *//; s/ *$//')" + if [ -n "$arg" ]; then + [ "$arg" = 0 ] && arg="no" || arg="yes" + [ "$arg" != "$gpl" ] && die "Incompatible license with system libx264" + fi + arg="$(grep '#define X264_BIT_DEPTH ' $x264_config_path | sed -e 's/#define X264_BIT_DEPTH *//; s/ *$//')" + if [ -n "$arg" ]; then + if [ "$arg" != "$bit_depth" ]; then + echo "Override output bit depth with system libx264 configuration" + bit_depth="$arg" + fi + fi + arg="$(grep '#define X264_CHROMA_FORMAT ' $x264_config_path | sed -e 's/#define X264_CHROMA_FORMAT *//; s/ *$//')" + if [ -n "$arg" ]; then + [ "$arg" = 0 ] && arg="all" || arg="${arg#X264_CSP_I}" + if [ "$arg" != "$chroma_format" ]; then + echo "Override output chroma format with system libx264 configuration" + chroma_format="$arg" + fi + fi + arg="$(grep '#define X264_INTERLACED ' $x264_config_path | sed -e 's/#define X264_INTERLACED *//; s/ *$//')" + if [ -n "$arg" ]; then + [ "$arg" = 0 ] && arg="no" || arg="yes" + if [ "$arg" != "$interlaced" ]; then + echo "Override interlaced encoding support with system libx264 configuration" + interlaced="$arg" + fi + fi + else + res=$? + log_fail + log_msg "Failed search path was: $x264_config_path" + fi + return $res +} + 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." +# Construct a path to the specified directory relative to the working directory +relative_path() { + local base="${PWD%/}" + local path="$(cd "$1" >/dev/null; printf '%s/.' "${PWD%/}")" + local up='' + + while [[ $path != "$base/"* ]]; do + base="${base%/*}" + up="../$up" + done + + dirname "$up${path#"$base/"}" +} + +SRCPATH="$(relative_path "$(dirname "$0")")" +echo "$SRCPATH" | grep -q ' ' && 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' @@ -311,7 +372,8 @@ NL=" # list of all preprocessor HAVE values we can define 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 X86_INLINE_ASM AS_FUNC" + LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC INTEL_DISPATCHER \ + MSA MMAP" # parse options @@ -384,8 +446,8 @@ for opt do --disable-thread) thread="no" ;; - --enable-win32thread) - thread="win32" + --disable-win32thread) + [ "$thread" != "no" ] && thread="posix" ;; --disable-swscale) swscale="no" @@ -458,6 +520,8 @@ host="${host#*-}" host_vendor="${host%%-*}" host_os="${host#*-}" +trap 'rm -f conftest*' EXIT + # test for use of compilers that require specific handling cc_base=`basename "$CC"` QPRE="-" @@ -477,13 +541,11 @@ if [[ $host_os = mingw* || $host_os = cygwin* ]]; then fi elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* ]]; then # Standard Microsoft Visual Studio - # Dependency creation includes absolute windows paths, Cygwin's make does not support Windows paths. - [[ $host_os = cygwin* ]] && die "Microsoft Visual Studio support requires MSYS" compiler=CL compiler_style=MS - CFLAGS="$CFLAGS -nologo -DHAVE_STRING_H -I\$(SRCPATH)/extras" - `$CC 2>&1 | grep -q 'for x86'` && host_cpu=i486 - `$CC 2>&1 | grep -q 'for x64'` && host_cpu=x86_64 + CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" + `$CC 2>&1 | grep -q 'x86'` && host_cpu=i486 + `$CC 2>&1 | grep -q 'x64'` && host_cpu=x86_64 cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer" fi else @@ -539,29 +601,18 @@ case $host_os in define HAVE_MALLOC_H libm="-lm" ;; - cygwin*) + cygwin*|mingw*|msys*) EXE=".exe" - 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 + if [[ $host_os = cygwin* ]] && cpp_check "" "" "defined(__CYGWIN__)" ; then SYS="CYGWIN" + define HAVE_MALLOC_H else SYS="WINDOWS" DEVNULL="NUL" LDFLAGSCLI="$LDFLAGSCLI -lshell32" - RC="${RC-${cross_prefix}windres}" + [ $compiler = GNU ] && RC="${RC-${cross_prefix}windres}" || RC="${RC-rc}" fi ;; - mingw*) - SYS="WINDOWS" - EXE=".exe" - DEVNULL="NUL" - LDFLAGSCLI="$LDFLAGSCLI -lshell32" - [ $compiler = GNU ] && RC="${RC-${cross_prefix}windres}" || RC="${RC-rc}" - ;; sunos*|solaris*) SYS="SunOS" define HAVE_MALLOC_H @@ -589,6 +640,9 @@ case $host_os in HAVE_GETOPT_LONG=0 CFLAGS="$CFLAGS -I\$(SRCPATH)/extras" ;; + *haiku*) + SYS="HAIKU" + ;; *) die "Unknown system $host, edit the configure" ;; @@ -596,72 +650,58 @@ esac LDFLAGS="$LDFLAGS $libm" -stack_alignment=16 +stack_alignment=4 case $host_cpu in i*86) ARCH="X86" - AS="yasm" + AS="${AS-yasm}" AS_EXT=".asm" - ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" + ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" 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" + CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" fi CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" - elif [ $compiler = ICC ]; then - # 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 - else # ICL/CL - # always a mod4 stack - stack_alignment=4 fi if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho -DPREFIX" + ASFLAGS="$ASFLAGS -f macho32 -DPREFIX" 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 ] && LDFLAGS="$LDFLAGS -Wl,--dynamicbase,--nxcompat,--tsaware" [ $compiler = GNU ] && RCFLAGS="--target=pe-i386 $RCFLAGS" else - ASFLAGS="$ASFLAGS -f elf" + ASFLAGS="$ASFLAGS -f elf32" fi ;; x86_64) ARCH="X86_64" - AS="yasm" + AS="${AS-yasm}" AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" + stack_alignment=16 [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" + ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" if cc_check '' "-arch x86_64"; then CFLAGS="$CFLAGS -arch x86_64" LDFLAGS="$LDFLAGS -arch x86_64" fi elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then - ASFLAGS="$ASFLAGS -f win32 -m amd64" + ASFLAGS="$ASFLAGS -f win64" # 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 ] && LDFLAGS="$LDFLAGS -Wl,--dynamicbase,--nxcompat,--tsaware" [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" else - ASFLAGS="$ASFLAGS -f elf -m amd64" + ASFLAGS="$ASFLAGS -f elf64" fi ;; - powerpc|powerpc64) + powerpc*) ARCH="PPC" if [ $asm = auto ] ; then define HAVE_ALTIVEC @@ -678,8 +718,10 @@ case $host_cpu in sparc) ARCH="SPARC" ;; - mips|mipsel|mips64|mips64el) + mips*) ARCH="MIPS" + AS="${AS-${CC}}" + AS_EXT=".c" ;; arm*) ARCH="ARM" @@ -697,6 +739,7 @@ case $host_cpu in ;; aarch64) ARCH="AARCH64" + stack_alignment=16 if [ "$SYS" = MACOSX ] ; then AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" ASFLAGS="$ASFLAGS -DPREFIX" @@ -755,6 +798,29 @@ if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o pic="yes" fi +if [ $compiler = GNU -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then + if cc_check '' -mpreferred-stack-boundary=5 ; then + CFLAGS="$CFLAGS -mpreferred-stack-boundary=5" + stack_alignment=32 + elif [ $stack_alignment -lt 16 ] && cc_check '' -mpreferred-stack-boundary=4 ; then + CFLAGS="$CFLAGS -mpreferred-stack-boundary=4" + stack_alignment=16 + fi +elif [ $compiler = ICC -a $ARCH = X86 ]; then + # icc on linux has various degrees of mod16 stack support + if [ $SYS = LINUX ]; then + # >= 12 defaults to a mod16 stack + if cpp_check "" "" "__INTEL_COMPILER >= 1200" ; then + stack_alignment=16 + # 11 <= x < 12 is capable of keeping a mod16 stack, but defaults to not doing so. + elif cpp_check "" "" "__INTEL_COMPILER >= 1100" ; then + CFLAGS="$CFLAGS -falign-stack=assume-16-byte" + stack_alignment=16 + fi + # < 11 is completely incapable of keeping a mod16 stack + fi +fi + if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then if ! as_check "vpmovzxwd ymm0, xmm0" ; then VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1` @@ -766,10 +832,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then cc_check '' '' '__asm__("pabsw %xmm0, %xmm0");' && define HAVE_X86_INLINE_ASM 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 @@ -788,9 +850,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then fi if [ $asm = auto -a $ARCH = AARCH64 ] ; then - # set flags so neon is built by default - echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon" - if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON ASFLAGS="$ASFLAGS -c" else @@ -805,6 +864,20 @@ if [ $asm = auto -a \( $ARCH = ARM -o $ARCH = AARCH64 \) ] ; then as_check ".func test${NL}.endfunc" && define HAVE_AS_FUNC 1 fi +if [ $asm = auto -a $ARCH = MIPS ] ; then + if ! echo $CFLAGS | grep -Eq '(-march|-mmsa|-mno-msa)' ; then + cc_check '' '-mmsa -mfp64 -mhard-float' && CFLAGS="-mmsa -mfp64 -mhard-float $CFLAGS" + fi + + if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then + define HAVE_MSA + else + echo "You specified a pre-MSA CPU in your CFLAGS." + echo "If you really want to run on such a CPU, configure with --disable-asm." + exit 1 + fi +fi + [ $asm = no ] && AS="" [ "x$AS" = x ] && asm="no" || asm="yes" @@ -815,23 +888,50 @@ define STACK_ALIGNMENT $stack_alignment ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$stack_alignment" # skip endianness check for Intel Compiler and MSVS, as all supported platforms are little. each have flags that will cause the check to fail as well +CPU_ENDIAN="little-endian" 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 + CPU_ENDIAN="big-endian" 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 +if [ "$cli_libx264" = "system" -a "$shared" != "yes" ] ; then + [ "$static" = "yes" ] && die "Option --system-libx264 can not be used together with --enable-static" + if ${cross_prefix}pkg-config --exists x264 2>/dev/null; then + X264_LIBS="$(${cross_prefix}pkg-config --libs x264)" + X264_INCLUDE_DIR="${X264_INCLUDE_DIR-$(${cross_prefix}pkg-config --variable=includedir x264)}" + configure_system_override "$X264_INCLUDE_DIR" || die "Detection of system libx264 configuration failed" + else + die "Can not find system libx264" + fi +fi -# 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" +# autodetect options that weren't forced nor disabled libpthread="" -if [ "$thread" = "auto" ]; then +if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then + if [ "$gpl" = "no" ] ; then + echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl" + thread="no" + elif cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then + libpthread="-lpthread" + elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then + libpthread="-lpthreadGC2" + elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then + 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 + libpthread="-lpthreadGC2 -lws2_32" + define PTW32_STATIC_LIB + else + thread="no" + fi +elif [ "$thread" != "no" ] ; then thread="no" case $SYS in BEOS) @@ -839,24 +939,8 @@ if [ "$thread" = "auto" ]; then define HAVE_BEOSTHREAD ;; WINDOWS) - if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then - thread="posix" - libpthread="-lpthread" - elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then - thread="posix" - libpthread="-lpthreadGC2" - elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then - 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 - thread="posix" - libpthread="-lpthreadGC2 -lws2_32" - define PTW32_STATIC_LIB - else - # default to native threading if pthread-win32 is unavailable - thread="win32" - fi + thread="win32" + define HAVE_WIN32THREAD ;; QNX) cc_check pthread.h -lc "pthread_create(0,0,0,0);" && thread="posix" && libpthread="-lc" @@ -878,20 +962,16 @@ if [ "$thread" = "posix" ]; 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 [ "$SYS" != "WINDOWS" ] && cpp_check "sys/mman.h unistd.h" "" "defined(MAP_PRIVATE)"; then + define HAVE_MMAP +fi + if [ "$SYS" = "LINUX" -a \( "$ARCH" = "X86" -o "$ARCH" = "X86_64" \) ] && cc_check "sys/mman.h" "" "MADV_HUGEPAGE;" ; then define HAVE_THP fi @@ -1044,7 +1124,7 @@ 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" + [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC" ASFLAGS="$ASFLAGS -DPIC" # resolve textrels in the x86 asm cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic" @@ -1093,6 +1173,12 @@ if cc_check '' -Wmaybe-uninitialized ; then CFLAGS="-Wno-maybe-uninitialized $CFLAGS" fi +if [ $compiler = ICC -o $compiler = ICL ] ; then + if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then + define HAVE_INTEL_DISPATCHER + fi +fi + if [ "$bit_depth" -gt "8" ]; then define HIGH_BIT_DEPTH ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=1" @@ -1131,12 +1217,43 @@ for var in $CONFIG_HAVE; do grep -q "HAVE_$var 1" config.h || define HAVE_$var 0 done +# 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 + +${SRCPATH}/version.sh >> x264_config.h + +if [ "$cli_libx264" = "system" ] ; then + if [ "$shared" = "yes" ]; then + CLI_LIBX264='$(SONAME)' + else + CLI_LIBX264= + LDFLAGSCLI="$X264_LIBS $LDFLAGSCLI" + cc_check 'stdint.h x264.h' '' 'x264_encoder_open(0);' || die "System libx264 can't be used for compilation of this version" + fi +else + CLI_LIBX264='$(LIBX264)' +fi + DEPMM="${QPRE}MM" DEPMT="${QPRE}MT" if [ $compiler_style = MS ]; then AR="lib -nologo -out:" LD="link -out:" - [ $compiler = ICL ] && AR="xi$AR" && LD="xi$LD" + if [ $compiler = ICL ]; then + AR="xi$AR" + LD="xi$LD" + else + mslink="$(dirname "$(command -v cl 2>/dev/null)")/link" + [ -x "$mslink" ] && LD="\"$mslink\" -out:" + fi HAVE_GETOPT_LONG=0 LDFLAGS="-nologo -incremental:no $(cl_ldflags $LDFLAGS)" LDFLAGSCLI="$(cl_ldflags $LDFLAGSCLI)" @@ -1183,19 +1300,6 @@ else PROF_USE_LD="-fprofile-use" 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 @@ -1205,7 +1309,7 @@ exec_prefix=$exec_prefix bindir=$bindir libdir=$libdir includedir=$includedir -ARCH=$ARCH +SYS_ARCH=$ARCH SYS=$SYS CC=$CC CFLAGS=$CFLAGS @@ -1284,23 +1388,9 @@ if [ "$static" = "yes" ]; then echo 'install: install-lib-static' >> config.mak fi -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 exec_prefix=$exec_prefix @@ -1322,6 +1412,7 @@ gpl_filters="" cat > conftest.log <> config.log cat conftest.log >> config.log cat conftest.log -rm conftest.log [ "$SRCPATH" != "." ] && ln -sf ${SRCPATH}/Makefile ./Makefile mkdir -p common/{aarch64,arm,ppc,x86} encoder extras filters/video input output tools