X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=540175346047d2c1673644e69f3b05e6d2c8d8fb;hb=00a00ccab316de3d50da6a82ba4af44dcb4655ec;hp=db7ad0e8431c5a069c0d52cd57029bb1b46b1060;hpb=acabceb6530d1858bcd009b055e217c75344c442;p=x264 diff --git a/configure b/configure index db7ad0e8..54017534 100755 --- a/configure +++ b/configure @@ -18,17 +18,18 @@ Standard options: --extra-asflags=EASFLAGS add EASFLAGS to ASFLAGS --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS + --extra-rcflags=ERCFLAGS add ERCFLAGS to RCFLAGS Configuration options: --disable-cli disable cli --system-libx264 use system libx264 instead of internal --enable-shared build shared library --enable-static build static library + --disable-opencl disable OpenCL features --disable-gpl disable GPL-only features --disable-thread disable multithreaded encoding --enable-win32thread use win32threads (windows only) --disable-interlaced disable interlaced encoding support - --enable-visualize enable visualization (X11 only) --bit-depth=BIT_DEPTH set output bit depth (8-10) [8] --chroma-format=FORMAT output chroma format (420, 422, 444, all) [all] @@ -45,11 +46,12 @@ Cross-compilation: --sysroot=SYSROOT root of cross-build tree External library support: - --disable-avs disable avisynth support (windows only) + --disable-avs disable avisynth support --disable-swscale disable swscale support --disable-lavf disable libavformat support --disable-ffms disable ffmpegsource support --disable-gpac disable gpac support + --disable-lsmash disable lsmash support EOF exit 1 @@ -79,6 +81,9 @@ intel_cflags() { [[ "$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 @@ -132,7 +137,7 @@ cc_check() { [ -n "$1" ] && echo "#include <$1>" > conftest.c echo "int main () { $3 return 0; }" >> conftest.c if [ $compiler = ICL ]; then - cc_cmd="$CC conftest.c $CFLAGS $2 -link $(icl_ldflags $2 $LDFLAGSCLI $LDFLAGS)" + 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 @@ -203,7 +208,12 @@ as_check() { rc_check() { log_check "whether $RC works" echo "$1" > conftest.rc - if $RC conftest.rc -o conftest.o >conftest.log 2>&1; then + 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 @@ -211,7 +221,7 @@ rc_check() { log_fail log_msg "Failed commandline was:" log_msg "--------------------------------------------------" - log_msg "$RC conftest.rc -o conftest.o" + log_msg "$rc_cmd" cat conftest.log >> config.log log_msg "--------------------------------------------------" log_msg "Failed program was:" @@ -237,6 +247,7 @@ 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}' @@ -253,6 +264,8 @@ avs="auto" lavf="auto" ffms="auto" gpac="auto" +lsmash="auto" +mp4="no" gpl="yes" thread="auto" swscale="auto" @@ -262,22 +275,24 @@ debug="no" gprof="no" strip="no" pic="no" -vis="no" bit_depth="8" chroma_format="all" compiler="GNU" +opencl="yes" 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 BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F VISUALIZE SWSCALE LAVF FFMS GPAC GF_MALLOC AVS GPL VECTOREXT INTERLACED CPU_COUNT" +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 @@ -329,6 +344,9 @@ for opt do --disable-gpac) gpac="no" ;; + --disable-lsmash) + lsmash="no" + ;; --disable-gpl) gpl="no" ;; @@ -341,6 +359,9 @@ for opt do --extra-ldflags=*) LDFLAGS="$LDFLAGS $optarg" ;; + --extra-rcflags=*) + RCFLAGS="$RCFLAGS $optarg" + ;; --disable-thread) thread="no" ;; @@ -364,12 +385,12 @@ for opt do --enable-pic) pic="yes" ;; - --enable-visualize) - vis="yes" - ;; --host=*) host="$optarg" ;; + --disable-opencl) + opencl="no" + ;; --cross-prefix=*) cross_prefix="$optarg" ;; @@ -404,6 +425,7 @@ 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=`${SRCPATH}/config.guess` @@ -423,7 +445,7 @@ if [[ $host_os = mingw* || $host_os = cygwin* ]]; 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 -Iextras" + 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 @@ -437,6 +459,7 @@ else fi fi +libm="" case $host_os in beos*) SYS="BEOS" @@ -445,37 +468,37 @@ 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 - LDFLAGS="$LDFLAGS -lm" + libm="-lm" ;; cygwin*) EXE=".exe" @@ -483,35 +506,58 @@ case $host_os in CFLAGS="$CFLAGS -mno-cygwin" LDFLAGS="$LDFLAGS -mno-cygwin" fi - if cpp_check "" "" "defined(__CYGWIN32__)" ; then + 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="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" @@ -524,12 +570,14 @@ case $host_cpu in 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 - define BROKEN_STACK_ALIGNMENT + 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" @@ -537,13 +585,15 @@ case $host_cpu in # >= 12 defaults to a mod16 stack fi # icl on windows has no mod16 stack support - [ $SYS = WINDOWS ] && define BROKEN_STACK_ALIGNMENT + [ $SYS = WINDOWS ] && stack_alignment=4 fi if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho -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 ] && RCFLAGS="--target=pe-i386 $RCFLAGS" else ASFLAGS="$ASFLAGS -f elf" fi @@ -551,16 +601,19 @@ case $host_cpu in x86_64) ARCH="X86_64" AS="yasm" + [ $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" = WINDOWS ]; then + elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then ASFLAGS="$ASFLAGS -f win32 -m amd64" # 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 @@ -628,9 +681,7 @@ case $host_cpu in ;; esac -RC="" if [ $SYS = WINDOWS ]; then - RC="${cross_prefix}windres" if ! rc_check "0 RCDATA {0}" ; then RC="" fi @@ -665,10 +716,10 @@ if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" -o fi if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then - if ! as_check "vpperm xmm0, xmm0, xmm0, xmm0" ; then + 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-1.0.0" + echo "Minimum version is yasm-1.2.0" echo "If you really want to compile without asm, configure with --disable-asm." exit 1 fi @@ -680,7 +731,12 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then 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 @@ -704,6 +760,9 @@ fi define ARCH_$ARCH define SYS_$SYS +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 @@ -748,11 +807,16 @@ if [ "$thread" = "auto" ]; then thread="win32" fi ;; - OPENBSD) - cc_check pthread.h -pthread && thread="posix" && libpthread="-pthread" + QNX) + cc_check pthread.h -lc "pthread_create(0,0,0,0);" && thread="posix" && libpthread="-lc" ;; *) - cc_check pthread.h -lpthread && thread="posix" && 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 @@ -777,16 +841,8 @@ 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 @@ -798,10 +854,10 @@ if [ "$swscale" = "auto" ] ; then [ -z "$SWSCALE_LIBS" ] && SWSCALE_LIBS="-lswscale -lavutil" 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(PIX_FMT_RGB)" ; then + if cpp_check "libavutil/pixdesc.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "defined(AV_PIX_FMT_FLAG_RGB)" ; then swscale="yes" else - echo "Warning: PIX_FMT_RGB is missing from libavutil, update for swscale support" + echo "Warning: AV_PIX_FMT_FLAG_RGB is missing from libavutil, update for swscale support" fi fi fi @@ -814,12 +870,12 @@ if [ "$lavf" = "auto" ] ; then 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" "avformat_find_stream_info(0,0); avcodec_open2(0,0,0);" ; then + if cc_check libavformat/avformat.h "$LAVF_CFLAGS $LAVF_LIBS" "avformat_close_input(0);" ; then if [ "$swscale" = "yes" ]; then lavf="yes" else @@ -872,11 +928,30 @@ if [ "$swscale" = "yes" ]; then fi fi -if [ "$gpac" = "auto" ] ; then +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" -a "$lsmash" != "yes" ] ; then gpac="no" - cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static" + GPAC_LIBS="-lgpac_static" + cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" if [ "$SYS" = "WINDOWS" ] ; then - GPAC_LIBS="$GPAC_LIBS -lwinmm" + 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 @@ -886,20 +961,32 @@ 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" # cygwin can use avisynth if it can use LoadLibrary - if [ $SYS = WINDOWS ] || ([ $SYS = CYGWIN ] && cc_check windows.h "" "LoadLibrary(0);") ; then - avs="yes" + 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 @@ -959,6 +1046,7 @@ fi if [ "$bit_depth" -gt "8" ]; then define HIGH_BIT_DEPTH ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=1" + opencl="no" else ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH=0" fi @@ -973,6 +1061,30 @@ ASFLAGS="$ASFLAGS -DBIT_DEPTH=$bit_depth" [ $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 @@ -988,6 +1100,7 @@ if [ $compiler = ICL ]; then 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" @@ -1001,6 +1114,7 @@ else DEPMT="-MT" LD="$CC -o " LIBX264=libx264.a + [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o " fi if [ $compiler = GNU ]; then PROF_GEN_CC="-fprofile-generate" @@ -1051,9 +1165,11 @@ 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 @@ -1061,6 +1177,7 @@ 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 @@ -1083,7 +1200,10 @@ if [ "$shared" = "yes" ]; then # 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 - grep "^\(int\|void\|x264_t\|extern\).*x264.*[\[(;]" x264.h | sed -e "s/.*\(x264.*\)[\[(].*/\1/;s/.*\(x264.*\);/\1/;s/open/open_$API/g" >> 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 @@ -1127,8 +1247,6 @@ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak ${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h -pclibs="-L$libdir -lx264 $libpthread" - cat > x264.pc << EOF prefix=$prefix exec_prefix=$exec_prefix @@ -1138,7 +1256,8 @@ includedir=$includedir Name: x264 Description: H.264 (MPEG4 AVC) encoder library Version: $(grep POINTVER < x264_config.h | sed -e 's/.* "//; s/".*//') -Libs: $pclibs +Libs: -L$libdir -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl) +Libs.private: $([ "$shared" = "yes" ] && echo $libpthread $libm $libdl) Cflags: -I$includedir EOF @@ -1159,15 +1278,15 @@ interlaced: $interlaced avs: $avs lavf: $lavf ffms: $ffms -gpac: $gpac +mp4: $mp4 gpl: $gpl thread: $thread +opencl: $opencl filters: $filters debug: $debug gprof: $gprof strip: $strip PIC: $pic -visualize: $vis bit depth: $bit_depth chroma format: $chroma_format EOF