[[ "$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
[ -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
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 VISUALIZE SWSCALE \
+ LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP"
# parse options
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`
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
;;
SYS="WINDOWS"
EXE=".exe"
DEVNULL="NUL"
+ LDFLAGSCLI="$LDFLAGSCLI -lshell32"
[ $compiler = ICL ] && RC="${RC-rc}" || RC="${RC-${cross_prefix}windres}"
;;
sunos*|solaris*)
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*)
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"
define HAVE_LOG2F
fi
+if [ "$SYS" = "LINUX" -a \( "$ARCH" = "X86" -o "$ARCH" = "X86_64" \) ] && cc_check "sys/mman.h" "" "MADV_HUGEPAGE;" ; then
+ define HAVE_THP
+fi
+
if [ "$vis" = "yes" ] ; then
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I/usr/X11R6/include"
[ -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
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
fi
if [ "$gpac" = "yes" ] ; then
define HAVE_GPAC
- 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"
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
+ if [ $SYS = WINDOWS ] || ([ $SYS = CYGWIN ] && cc_check windows.h "" "LoadLibraryW(0);") ; then
avs="avisynth"
define HAVE_AVS
define USE_AVXSYNTH 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
AR=$AR
RANLIB=$RANLIB
STRIP=$STRIP
+INSTALL=$INSTALL
AS=$AS
ASFLAGS=$ASFLAGS
RC=$RC
PROF_GEN_LD=$PROF_GEN_LD
PROF_USE_CC=$PROF_USE_CC
PROF_USE_LD=$PROF_USE_LD
+HAVE_OPENCL=$opencl
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
Name: x264
Description: H.264 (MPEG4 AVC) encoder library
Version: $(grep POINTVER < x264_config.h | sed -e 's/.* "//; s/".*//')
-Libs: -L$libdir -lx264
-Libs.private: $libpthread $libm
+Libs: -L$libdir -lx264 $([ "$shared" = "yes" ] || echo $libpthread $libm $libdl)
+Libs.private: $([ "$shared" = "yes" ] && echo $libpthread $libm $libdl)
Cflags: -I$includedir
EOF
gpac: $gpac
gpl: $gpl
thread: $thread
+opencl: $opencl
filters: $filters
debug: $debug
gprof: $gprof
visualize: $vis
bit depth: $bit_depth
chroma format: $chroma_format
-opencl: $opencl
EOF
echo >> config.log
projects / x264 / blobdiff