X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=ca4f44953a83911400416b8ea6573386fc90014f;hb=7e081bd859a7ca89e702e80a9f8997064d93b196;hp=9cd777034143d8d79a34bd385514244ed36ad1b3;hpb=abe11eaba564cfe564245dcac1f5e439a800ff1f;p=x264 diff --git a/configure b/configure index 9cd77703..ca4f4495 100755 --- a/configure +++ b/configure @@ -1,33 +1,35 @@ #!/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= + 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 +98,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 $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 +122,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:" @@ -138,7 +188,7 @@ die() { exit 1 } -rm -f x264_config.h 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* prefix='/usr/local' exec_prefix='${prefix}' @@ -152,7 +202,7 @@ lavf="auto" ffms="auto" gpac="auto" gpl="yes" -pthread="auto" +thread="auto" swscale="auto" asm="auto" debug="no" @@ -161,6 +211,7 @@ pic="no" vis="no" shared="no" bit_depth="8" +compiler="GNU" CFLAGS="$CFLAGS -Wall -I." LDFLAGS="$LDFLAGS" @@ -172,7 +223,7 @@ 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 VISUALIZE SWSCALE LAVF FFMS GPAC GF_MALLOC AVS GPL VECTOREXT" # parse options @@ -221,8 +272,11 @@ for opt do --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}" ;; - --disable-pthread) - pthread="no" + --disable-thread) + thread="no" + ;; + --enable-win32thread) + thread="win32" ;; --disable-swscale) swscale="no" @@ -285,6 +339,26 @@ 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 -Iextras" + 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 + case $host_os in beos*) SYS="BEOS" @@ -321,16 +395,21 @@ case $host_os in LDFLAGS="$LDFLAGS -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(__CYGWIN32__)" ; then + define HAVE_MALLOC_H + SYS="CYGWIN" + else + SYS="WINDOWS" + DEVNULL="NUL" + fi ;; mingw*) - SYS="MINGW" + SYS="WINDOWS" EXE=".exe" DEVNULL="NUL" ;; @@ -350,15 +429,31 @@ case $host_cpu in 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 + 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 + # 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 ] && define BROKEN_STACK_ALIGNMENT 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" else @@ -368,15 +463,16 @@ case $host_cpu in x86_64) ARCH="X86_64" AS="yasm" - if [ "$SYS" = MACOSX ];then + 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 ]; 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" else ASFLAGS="$ASFLAGS -f elf -m amd64" fi @@ -455,10 +551,14 @@ 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 @@ -466,15 +566,15 @@ 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 "lzcnt eax, eax" ; then - VER=`($AS --version || echo no assembler) 2>$DEVNULL | head -n 1` + if ! as_check "vpaddw xmm0, xmm0, 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-0.7.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." @@ -505,52 +605,71 @@ 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" +# 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" + cc_check pthread.h -pthread && thread="posix" && libpthread="-pthread" ;; *) - cc_check pthread.h -lpthread && pthread="yes" && libpthread="-lpthread" + cc_check pthread.h -lpthread && thread="posix" && libpthread="-lpthread" ;; esac fi -if test "$pthread" = "yes" ; then - define HAVE_PTHREAD +if [ "$thread" = "posix" ]; then LDFLAGS="$LDFLAGS $libpthread" + define HAVE_POSIXTHREAD +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 @@ -570,7 +689,7 @@ fi if [ "$swscale" = "auto" ] ; then swscale="no" - if ${cross_prefix}pkg-config --exists libswscale 2>$DEVNULL; then + if ${cross_prefix}pkg-config --exists libswscale 2>/dev/null; then SWSCALE_LIBS="$SWSCALE_LIBS $(${cross_prefix}pkg-config --libs libswscale)" SWSCALE_CFLAGS="$SWSCALE_CFLAGS $(${cross_prefix}pkg-config --cflags libswscale)" fi @@ -593,7 +712,7 @@ 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 @@ -605,15 +724,14 @@ if [ "$lavf" = "auto" ] ; then 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 cpp_check libavcodec/avcodec.h "$LAVF_CFLAGS $LAVF_LIBS" "LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,64,0)" ; then if [ "$swscale" = "yes" ]; then lavf="yes" else echo "Warning: libavformat is not supported without swscale support" fi else - echo "Warning: libavutil is too old, update to ffmpeg r21854+" + echo "Warning: libavcodec is too old, update to ffmpeg r22735+" fi fi fi @@ -622,7 +740,7 @@ if [ "$ffms" = "auto" ] ; then ffms_major="2"; ffms_minor="14"; ffms_micro="0"; 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 @@ -662,12 +780,12 @@ if [ "$swscale" = "yes" ]; then fi fi -GPAC_LIBS="-lgpac_static" -if [ $SYS = MINGW ]; then - GPAC_LIBS="$GPAC_LIBS -lwinmm" -fi if [ "$gpac" = "auto" ] ; then gpac="no" + cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static" + if [ "$SYS" = "WINDOWS" ] ; then + 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" @@ -686,12 +804,15 @@ fi if [ "$avs" = "auto" ] ; then avs="no" - if [ $SYS = MINGW ] && cc_check extras/avisynth_c.h ; then + # cygwin can use avisynth if it can use LoadLibrary + if [ $SYS = WINDOWS ] || ([ $SYS = CYGWIN ] && cc_check windows.h "" "LoadLibrary(0);") ; then avs="yes" define HAVE_AVS 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" @@ -718,12 +839,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 @@ -744,6 +873,45 @@ 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= + 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 +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 @@ -765,8 +933,12 @@ 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 @@ -775,26 +947,44 @@ ASFLAGS=$ASFLAGS 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 EOF +if [ $compiler = ICL ]; then + echo '%.o: %.c' >> config.mak + echo ' $(CC) $(CFLAGS) -c -Fo$@ $<' >> config.mak +fi + if [ "$shared" = "yes" ]; then API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') - if [ "$SYS" = "MINGW" ]; then + 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)' >> 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 + else + echo 'IMPLIBNAME=libx264.dll.a' >> config.mak + echo 'SOFLAGS=-shared -Wl,--out-implib,$(IMPLIBNAME) -Wl,--enable-auto-image-base' >> 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)' >> 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)' >> 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)' >> config.mak fi echo 'default: $(SONAME)' >> config.mak fi @@ -830,7 +1020,7 @@ lavf: $lavf ffms: $ffms gpac: $gpac gpl: $gpl -pthread: $pthread +thread: $thread filters: $filters debug: $debug gprof: $gprof