X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=7fea42154e905d4157109ae52c7695a14bbefc5d;hb=0e69048d4f9664f1293c5eed0604522c67adaff5;hp=88a272576afb0caee121a8859e7e348c3793562f;hpb=aa50e72e7c723927325d031ab47b24e069dde4e3;p=x264 diff --git a/configure b/configure index 88a27257..7fea4215 100755 --- a/configure +++ b/configure @@ -4,36 +4,55 @@ if test x"$1" = x"-h" -o x"$1" = x"--help" ; then cat < 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 } @@ -195,6 +241,11 @@ die() { 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}' bindir='${exec_prefix}/bin' @@ -221,19 +272,22 @@ strip="no" pic="no" vis="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 BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F VISUALIZE SWSCALE LAVF FFMS GPAC GF_MALLOC AVS GPL VECTOREXT INTERLACED" +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" # parse options @@ -289,13 +343,16 @@ for opt do 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-thread) thread="no" @@ -324,23 +381,33 @@ for opt do 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" ;; @@ -355,10 +422,10 @@ RANLIB="${RANLIB-${cross_prefix}ranlib}" STRIP="${STRIP-${cross_prefix}strip}" 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%%-*}" @@ -372,7 +439,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 @@ -386,6 +453,7 @@ else fi fi +libm="" case $host_os in beos*) SYS="BEOS" @@ -394,32 +462,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 + libm="-lm" ;; cygwin*) EXE=".exe" @@ -433,24 +506,41 @@ case $host_os in else SYS="WINDOWS" DEVNULL="NUL" + RC="${RC-${cross_prefix}windres}" fi ;; mingw*) SYS="WINDOWS" EXE=".exe" DEVNULL="NUL" + [ $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 + 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" + +aligned_stack=1 case $host_cpu in i*86) ARCH="X86" @@ -463,12 +553,15 @@ 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 + aligned_stack=0 # 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" @@ -476,13 +569,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 ] && define BROKEN_STACK_ALIGNMENT && aligned_stack=0 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 @@ -490,6 +585,7 @@ 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 @@ -500,6 +596,8 @@ case $host_cpu in 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 @@ -553,16 +651,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 +ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=${aligned_stack}" + +if [ $SYS = WINDOWS ]; then + if ! rc_check "0 RCDATA {0}" ; then + RC="" + fi +fi log_msg "x264 configure script" if [ -n "$*" ]; then @@ -588,15 +696,15 @@ if [ $compiler != ICL ]; then 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" \) ] ; then pic="yes" fi if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then - if ! as_check "vpaddw 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-0.7.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 @@ -676,8 +784,8 @@ if [ "$thread" = "auto" ]; then thread="win32" fi ;; - OPENBSD) - cc_check pthread.h -pthread && thread="posix" && libpthread="-pthread" + QNX) + cc_check pthread.h -lc && thread="posix" && libpthread="-lc" ;; *) cc_check pthread.h -lpthread && thread="posix" && libpthread="-lpthread" @@ -687,6 +795,9 @@ fi 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 @@ -723,10 +834,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 cc_check "libavutil/pixdesc.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "av_get_pix_fmt_name(0);" ; then + if cpp_check "libavutil/pixdesc.h" "$SWSCALE_CFLAGS $SWSCALE_LIBS" "defined(PIX_FMT_RGB)" ; then swscale="yes" else - echo "Warning: av_get_pix_fmt_name is missing from libavutil, update for swscale support" + echo "Warning: PIX_FMT_RGB is missing from libavutil, update for swscale support" fi fi fi @@ -744,7 +855,7 @@ if [ "$lavf" = "auto" ] ; then done fi LAVF_LIBS="-L. $LAVF_LIBS" - if cc_check libavformat/avformat.h "$LAVF_CFLAGS $LAVF_LIBS" "avformat_open_input(0,0,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 @@ -754,7 +865,7 @@ if [ "$lavf" = "auto" ] ; then 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>/dev/null; then @@ -813,7 +924,7 @@ if [ "$gpac" = "auto" ] ; then fi if [ "$gpac" = "yes" ] ; then define HAVE_GPAC - if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "gf_malloc(1); gf_free(NULL);" ; then + if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "void *p; p = gf_malloc(1); gf_free(p);" ; then define HAVE_GF_MALLOC fi LDFLAGSCLI="$GPAC_LIBS $LDFLAGSCLI" @@ -823,8 +934,16 @@ 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" + 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 @@ -834,7 +953,8 @@ 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 @@ -882,7 +1002,14 @@ 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 ASFLAGS="$ASFLAGS -DBIT_DEPTH=$bit_depth" @@ -906,6 +1033,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" @@ -919,6 +1047,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" @@ -939,15 +1068,19 @@ 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_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 @@ -967,6 +1100,8 @@ RANLIB=$RANLIB STRIP=$STRIP AS=$AS ASFLAGS=$ASFLAGS +RC=$RC +RCFLAGS=$RCFLAGS EXE=$EXE HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG DEVNULL=$DEVNULL @@ -976,6 +1111,60 @@ PROF_USE_CC=$PROF_USE_CC PROF_USE_LD=$PROF_USE_LD EOF +if [[ $host_os != mingw* ]]; then + # OpenCL support is only well tested on Windows/MinGW. If you + # wish to try it on an unsupported platform, swap the lines + # below. If OpenCL breaks, you get to keep both halves + #opencl="yes" + opencl="no" +fi +if [ "$opencl" = "yes" ]; then + log_check "looking for perl" + output=$(perl -v) + if [ "$output" = "" ]; then + echo 'OpenCL support requires perl to compile.' + echo 'use --disable-opencl to compile without OpenCL.' + exit 1 + elif [[ $cross_prefix != "" && $host_os == mingw* ]] ; then + if cc_check "CL/cl.h" "-lOpenCL"; then + echo 'HAVE_OPENCL=yes' >> config.mak + echo 'OPENCL_LIB=OpenCL' >> config.mak + echo "OPENCL_INC_DIR=." >> config.mak + echo "OPENCL_LIB_DIR=." >> config.mak + define HAVE_OPENCL + else + opencl="no" + fi + elif [ "$CUDA_PATH" != "" ]; then + echo 'HAVE_OPENCL=yes' >> config.mak + echo 'OPENCL_LIB=OpenCL' >> config.mak + echo 'OPENCL_INC_DIR=$(CUDA_PATH)include' >> config.mak + if [ "$ARCH" = "X86" ]; then + echo 'OPENCL_LIB_DIR=$(CUDA_PATH)lib/Win32' >> config.mak + else + echo 'OPENCL_LIB_DIR=$(CUDA_PATH)lib/x64' >> config.mak + fi + define HAVE_OPENCL + elif [ -e "$AMDAPPSDKROOT/include/CL/cl.h" ]; then + if [[ $host_os = mingw* ]]; then + app_path=`echo "/$AMDAPPSDKROOT" | sed 's/\\\/\//g' | sed 's/://'` + else + app_path='$(AMDAPPSDKROOT)' + fi + echo 'HAVE_OPENCL=yes' >> config.mak + echo 'OPENCL_LIB=OpenCL' >> config.mak + echo OPENCL_INC_DIR=$app_path/include >> config.mak + if [ "$ARCH" = "X86" ]; then + echo OPENCL_LIB_DIR=$app_path/lib/x86 >> config.mak + else + echo OPENCL_LIB_DIR=$app_path/lib/x86_64 >> config.mak + fi + define HAVE_OPENCL + else + opencl="no" + fi +fi + if [ $compiler = ICL ]; then echo '%.o: %.c' >> config.mak echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak @@ -987,32 +1176,35 @@ if [ "$cli" = "yes" ]; then fi if [ "$shared" = "yes" ]; then - API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') + 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 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)' >> config.mak + 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' >> 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=-shared -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=-shared -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=-shared -Wl,-soname,$(SONAME)' >> config.mak + echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> config.mak fi echo 'default: lib-shared' >> config.mak echo 'install: install-lib-shared' >> config.mak @@ -1038,9 +1230,7 @@ fi echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak -./version.sh >> config.h - -pclibs="-L$libdir -lx264 $libpthread" +${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h cat > x264.pc << EOF prefix=$prefix @@ -1050,8 +1240,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 +Libs.private: $libpthread $libm Cflags: -I$includedir EOF @@ -1061,27 +1252,29 @@ gpl_filters="" [ $gpl = yes ] && filters="$filters $gpl_filters" cat > conftest.log <> config.log @@ -1089,6 +1282,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."