X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=a2d5b501a63ae120b6a3349809816660329362ed;hp=9492e988e079769daee4dc4171af3f6d1f7ed4d5;hb=ae9b00c3f960e5bd9f74a9d9103e332f4c288ab4;hpb=fb661e853152fd63537629a20f493a4cdcd4f019 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 9492e988..a2d5b501 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -12,7 +12,7 @@ CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros" CFG_CFLAGS+=" -pthread -Wall" # misguided pedantic warnings # this is extra work, not a gain... -CFG_CFLAGS+=" -Wno-unknown-warning" +CFG_CFLAGS+=" -Wno-unknown-warning-option" CFG_CFLAGS+=" -Wno-attributes" CFG_CFLAGS+=" -Wno-unused-result" CFG_CFLAGS+=" -Wno-stringop-overflow" @@ -29,8 +29,6 @@ CFG_CFLAGS+=" -I/usr/include/freetype2 -I/usr/local/include/freetype2" CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid" CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools" -CFG_LDFLAGS+=" -z noexecstack" - AC_DEFUN([CHECK_WITH], [ AC_ARG_WITH([$1], AC_HELP_STRING([--with-[$1]], [$2 ($4)]), @@ -41,13 +39,15 @@ AC_SUBST([WANT_$3]) CHECK_WITH([jobs],[parallel build jobs],[JOBS],[auto]) CHECK_WITH([exec-name],[binary executable name],[CIN],[cin]) CHECK_WITH([single-user],[to install cin in bin],[CINBIN_BUILD],[no]) -CHECK_WITH([ladspa-build],[build ladspa library],[LADSPA_BUILD],[yes]) CHECK_WITH([lv2],[lv2 library support],[LV2],[yes]) CHECK_WITH([cinlib],[cinelerra library path],[CINLIB_DIR],[auto]) CHECK_WITH([cindat],[cinelerra share path],[CINDAT_DIR],[auto]) CHECK_WITH([plugin-dir],[plugin install dir],[PLUGIN_DIR],[auto]) CHECK_WITH([ladspa-dir],[ladspa install dir],[LADSPA_DIR],[auto]) +CHECK_WITH([ladspa-build],[build ladspa library],[LADSPA_BUILD],[yes]) CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5]) +CHECK_WITH([nested-dir],[nested proxy dir],[NESTED_DIR],[$$HOME/Videos]) +CHECK_WITH([snap-dir],[snapshot/grabshot dir],[SNAP_DIR],[$$HOME/Pictures]) CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox]) CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no]) CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto]) @@ -56,10 +56,13 @@ CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes]) CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes]) CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes]) CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes]) +CHECK_WITH([wintv],[usb 2040:826d wintv device],[WINTV],[yes]) +CHECK_WITH([x10tv],[usb 0bc7:0004 X10 remote device],[X10TV],[yes]) CHECK_WITH([vaapi],[video acceleration api],[VAAPI],[yes]) CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes]) CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes]) CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto]) +CHECK_WITH([clang],[use clang instead of gcc/g++],[CLANG],[no]) if test "x$WANT_LV2" != "xno"; then GTK2_LIBS=`pkg-config --libs gtk+-2.0` @@ -186,7 +189,7 @@ PKG_3RD([esound],[no], [ . ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-4.1.4], + [ffmpeg-4.2], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -367,12 +370,12 @@ PKG_3RD([x264],[auto], [ . ]) PKG_3RD([x265],[auto], - [x265_3.0], + [x265_3.1.2], [ libx265.a ], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.8.0], + [libvpx-1.8.1], [ libvpx.a ], [ . ]) @@ -411,6 +414,11 @@ PKG_3RD([libaom],[auto], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) +PKG_3RD([dav1d],[auto], + [dav1d-0.5.0], + [ usr/local/lib*/libdav1d*.a ], + [ usr/local/include ]) + PKG_3RD([libwebp],[auto], [libwebp-1.0.2], [ usr/local/lib*/libwebp*.a ], @@ -468,6 +476,7 @@ if test "x$I86$X86" != "x00" ; then rm -f conftest.asm conftest.o REQUIRE_PROG(YASM, [yasm]) fi + ## end arch dep tests REQUIRE_PROG(OBJCOPY, [objcopy]) @@ -500,7 +509,7 @@ fi AC_DEFUN([CHECK_LIB], [ if test "x$HAVE_$1" != "xno"; then - if test "x$PKG_$1" = "x" -o "x$WANT_STATIC_BUILD" = "xno" -a "x$PKG_$1" = "xauto"; then + if test "x$PKG_$1" = "x" -o "x$WANT_STATIC_BUILD" = "xno" -a "x$PKG_$1" != "xno"; then AC_CHECK_LIB([$2], [$3], [HAVE_$1=yes], [HAVE_$1=no], [$4]) AC_SUBST([HAVE_$1]) if test "x$WANT_$1" != "xno"; then @@ -527,8 +536,6 @@ CHECK_LIB([XEXT], [Xext], [XShmQueryExtension]) CHECK_HEADERS([XEXT], [Xlib XShm extention], [X11/Xlib.h X11/extensions/XShm.h X11/extensions/shape.h]) CHECK_LIB([XINERAMA], [Xinerama], [XineramaQueryExtension]) CHECK_HEADERS([XINERAMA], [Xinerama headers], [X11/extensions/Xinerama.h]) -CHECK_LIB([XV], [Xv], [XvQueryExtension]) -CHECK_HEADERS([XV], [Xlib Xv extention], [X11/Xlib.h X11/extensions/Xvlib.h]) CHECK_LIB([XFIXES], [Xfixes], [XFixesQueryVersion]) CHECK_LIB([BZ2], [bz2], [BZ2_bzDecompress]) CHECK_LIB([FONTCONFIG], [fontconfig], [FcInit]) @@ -579,23 +586,34 @@ CHECK_LIB([opus], [opus], [opus_multistream_decoder_create]) CHECK_HEADERS([opus], [libopus headers], [opus/opus_multistream.h]) CHECK_LIB([libaom], [aom], [aom_codec_version]) CHECK_HEADERS([libaom], [libaom headers], [aom/aom.h]) +CHECK_LIB([dav1d], [dav1d], [dav1d_version]) +CHECK_HEADERS([dav1d], [libdav1d headers], [dav1d/dav1d.h]) CHECK_LIB([libwebp], [webp], [WebPGetEncoderVersion]) CHECK_HEADERS([libwebp], [libwebp headers], [webp/encode.h]) CHECK_LIB([a52dec], [a52], [a52_init]) -CHECK_HEADERS([a52dec], [a52 headers], [a52.h]) +CHECK_HEADERS([a52dec], [a52 headers], [stdint.h a52.h]) CHECK_LIB([encore], [encore], [encore]) CHECK_HEADERS([encore], [encore headers], [encore.h]) CHECK_LIB([giflib], [gif], [DGifOpen]) CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h]) CHECK_LIB([jbig], [jbig], [jbg_dec_init]) + CHECK_LIB([VDPAU], [vdpau], [vdp_device_create_x11]) +if test "x$HAVE_VDPAU" != "xyes" -a "x$WANT_VDPAU" = "xyes"; then + AC_MSG_ERROR([requires vdpau support.]) +fi + CHECK_LIB([VAAPI], [va], [vaInitialize]) -if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then +if test "x$HAVE_VAAPI" = "xyes" -a "x$WANT_VAAPI" != "xno"; then CHECK_HEADERS([vaapi_x11], [va x11 headers], [va/va_x11.h]) CHECK_LIB([vaapi_x11], [va-x11], [vaGetDisplay]) CHECK_HEADERS([vaapi_drm], [va drm headers], [va/va_drm.h]) CHECK_LIB([vaapi_drm], [va-drm], [vaGetDisplayDRM]) fi +if test "x$HAVE_VAAPI" != "xyes" -a "x$WANT_VAAPI" = "xyes"; then + AC_MSG_ERROR([requires vaapi support.]) +fi + #CHECK_LIB([NVENC], [nvidia-encode], [NvEncodeAPICreateInstance]) #if test "x$HAVE_mjpegtools" = "xyes"; then @@ -605,20 +623,17 @@ fi AC_DEFUN([CHECK_WANT], [ RESULT=yes # WANT_$1 -if test "x$WANT_$1" != "xno" ; then AC_ARG_WITH(m4_tolower([$1]), AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)), [WANT_$1=$withval],[WANT_$1=$2]) m4_quote($4) - if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then - if test "x$WANT_$1" = "xyes" ; then + if test "x$WANT_$1" = "xauto" ; then + WANT_$1="$RESULT" + elif test "x$WANT_$1" = "xyes" ; then + if test "x$RESULT" = "xno" -a "x$PKG_$1" = "x"; then AC_MSG_ERROR([required for $1 support.]) fi - WANT_$1=no - elif test "x$WANT_$1" = "xauto" ; then - WANT_$1=yes fi -fi CFG_WANTS+=" $1" AC_SUBST([WANT_$1]) ]) @@ -628,6 +643,10 @@ CHECK_WANT([GL], [auto], [use opengl], [ CHECK_LIB([GL], [GLU], [gluOrtho2D]) CHECK_HEADERS([GL], [opengl headers], [GL/gl.h GL/glext.h GL/glu.h GL/glx.h])]) +CHECK_WANT([XV], [auto], [use xv], [ + CHECK_LIB([xv], [Xv], [XvQueryExtension]) + CHECK_HEADERS([xv], [Xlib Xv extention], [X11/Xlib.h X11/extensions/Xvlib.h])]) + CHECK_WANT([OSS], [auto], [use OSS audio], [ CHECK_HEADERS([OSS], [oss headers], [sys/soundcard.h])]) @@ -648,6 +667,15 @@ CHECK_WANT([FIREWIRE], [auto], [use firewire], [ CHECK_HEADERS([libiec61883], [libiec61883 headers], [libiec61883/iec61883.h]) CHECK_LIB([libraw1394], [raw1394], [raw1394_iso_recv_init]) CHECK_HEADERS([libraw1394], [libraw1394 headers], [libraw1394/raw1394.h])]) +# have all or none +test "x$HAVE_libavc1394" = "xyes" && \ +test "x$HAVE_libiec61883" = "xyes" && \ +test "x$HAVE_libraw1394" = "xyes" && \ + HAVE_FIREWIRE=yes || \ +HAVE_libavc1394=no && \ +HAVE_libiec61883=no && \ +HAVE_libraw1394=no && \ + HAVE_FIREWIRE=no CHECK_WANT([DV], [auto], [use dv], [ CHECK_LIB([libdv], [dv], [dv_init]) @@ -667,6 +695,29 @@ CHECK_WANT([ESOUND], [no], [use esd], [ CHECK_HEADERS([esound], [esound headers], [esd.h]) CHECK_LIB([audiofile], [audiofile], [afOpenFile]) CHECK_HEADERS([audiofile], [audiofile headers], [audiofile.h])]) +# have all or none +test "x$HAVE_esound" = "xyes" && \ +test "x$HAVE_audiofile" = "xyes" && \ + HAVE_ESOUND=yes || \ +HAVE_esound=no && \ +HAVE_audiofile=no && \ + HAVE_ESOUND=no + +CHECK_WANT([PULSE], [auto], [use pulseaudio], [ + CHECK_LIB([pulse_simple], [pulse-simple], [pa_simple_new]) + CHECK_HEADERS([pulse_simple], [pulse-simple headers], [pulse/simple.h]) + CHECK_LIB([pulse], [pulse], [pa_context_new]) + CHECK_HEADERS([pulse], [pulse headers], [pulse/error.h])]) + +CHECK_WANT([ISOFS], [auto], [use isofs], [ + CHECK_HEADERS([isofs], [isofs headers], [linux/isofs.h])]) + +if test "x$WANT_LADSPA_BUILD" != "xyes" ; then + CHECK_WANT([LADSPA], [auto], [ladspa plugin clients], [ + CHECK_HEADERS([ladspa], [ladspa headers], [ladspa.h])]) +else + WANT_LADSPA=yes +fi CHECK_WANT([SHUTTLE], [yes], [shuttle dev support], [ CHECK_HEADERS([keysyms], [x11 keysym defs], [X11/keysymdef.h])]) @@ -689,6 +740,21 @@ CHECK_WANT([LV2], [auto], [use lv2], [ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0" CHECK_HEADERS([lv2], [suil headers], [suil/suil.h]) CFLAGS="$saved_CFLAGS"]) +# have all or none +test "x$HAVE_lv2" = "xyes" && \ +test "x$HAVE_lilv" = "xyes" && \ +test "x$HAVE_sord" = "xyes" && \ +test "x$HAVE_serd" = "xyes" && \ +test "x$HAVE_sratom" = "xyes" && \ +test "x$HAVE_suil" = "xyes" && \ + HAVE_LV2=yes || \ +HAVE_lv2=no && \ +HAVE_lilv=no && \ +HAVE_sord=no && \ +HAVE_serd=no && \ +HAVE_sratom=no && \ +HAVE_suil=no && \ + HAVE_LV2=no CHECK_WANT([CUDA], [auto], [build cuda plugins], [ CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])]) @@ -696,8 +762,6 @@ CHECK_WANT([CUDA], [auto], [build cuda plugins], [ CHECK_WANT([DL], [auto], [system has libdl], [ CHECK_LIB([DL], [dl], [dlopen])]) -CHECK_WANT([EXR], [auto], [use exr], []) - CHECK_WANT([OPENCV], [no], [opencv=sys/sta/dyn,git/tar=url], [ ]) @@ -728,10 +792,15 @@ EXRIStream() : Imf::IStream("mypath") {} }; class EXROStream : public Imf::OStream { public: EXROStream() : Imf::OStream("mypath") {} }; ]])], [HAVE_OPENEXR=yes], [HAVE_OPENEXR=no]) - RESULT="$HAVE_OPENEXR" - if test "x$RESULT" = "xyes"; then - SHARED_openexr="$LIBS" - CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" + if test "x$WANT_OPENEXR" = "xauto"; then + WANT_OPENEXR="yes" + fi + if test "x$WANT_OPENEXR" = "xyes" -a "x$HAVE_OPENEXR" = "xyes"; then + if test "x$WANT_STATIC_BUILD" = "xno"; then + SHARED_openexr="$LIBS" + SHARED_LIBS+=" $LIBS" + CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" + fi fi LIBS="$saved_LIBS" CXXFLAGS="$saved_CXXFLAGS" @@ -739,6 +808,13 @@ EXROStream() : Imf::OStream("mypath") {} }; AC_MSG_RESULT([$HAVE_OPENEXR]) ]) AC_SUBST([HAVE_OPENEXR]) +# have all or none +test "x$HAVE_openexr" = "xyes" && \ +test "x$HAVE_ilmbase" = "xyes" && \ + HAVE_OPENEXR=yes || \ +HAVE_openexr=no && \ +HAVE_ilmbase=no && + HAVE_OPENEXR=no # build global_config OBJDIR=`uname -m` @@ -754,6 +830,7 @@ AC_DEFUN([PKG_DISABLED],[ echo "AC_HELP_STRING([disabled],[$1])" ]) AC_DEFUN([PKG_SHARED],[ + PKG_$1="shared" BUILD_$1=0 AC_SUBST(BUILD_$1) SHARED_LIBS+="$SHARED_$1" @@ -780,7 +857,7 @@ for dep in \ openexr/ilmbase ilmbase/libogg \ libtheora/libogg libtheora/libvorbis ; do lib=`dirname $dep`; needs=`basename $dep` - eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs"; + eval pkg_lib="\$PKG_$lib" if test "x$pkg_lib" != "xno"; then eval "PKG_$needs=yes" fi @@ -790,7 +867,11 @@ fi AC_DEFUN([PKG_PROVIDE],[ if test "x$BUILD_$1" = "x" ; then if test "x$PKG_$1" = "xyes"; then - PKG_FORCED([$1]) + if test "x$WANT_CIN_3RDPARTY" = "xno"; then + PKG_SHARED([$1]) + else + PKG_FORCED([$1]) + fi elif test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then PKG_DISABLED([$1]) elif test "x$WANT_STATIC_BUILD" = "xyes"; then @@ -827,6 +908,7 @@ PKG_PROVIDE([libuuid]) PKG_PROVIDE([libvorbis]) PKG_PROVIDE([mjpegtools]) PKG_PROVIDE([libaom]) +PKG_PROVIDE([dav1d]) PKG_PROVIDE([libwebp]) PKG_PROVIDE([openexr], [$WANT_OPENEXR]) PKG_PROVIDE([openjpeg]) @@ -865,10 +947,10 @@ echo "" if test "x$WANT_CIN_3RDPARTY" != "xno"; then CFG_CFLAGS+=" -DHAVE_CIN_3RDPARTY" fi -for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \ - VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \ - COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB \ - VAAPI VDPAU CUDA NV; do +for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB LADSPA \ + VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \ + COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB XV \ + VAAPI VDPAU CUDA NV WINTV X10TV; do eval vv="\$WANT_$v" if test "x$vv" != "xno"; then CFG_CFLAGS+=" -DHAVE_$v" @@ -880,32 +962,10 @@ for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \ echo " using: $vv-$v" done -echo " using: with-jobs = $WANT_JOBS" -echo " using: exec-name = $WANT_CIN" -echo " using: with-cinlib = $WANT_CINLIB_DIR" -echo " using: with-cindat = $WANT_CINDAT_DIR" -echo " using: with-config-dir = $WANT_CONFIG_DIR" -echo " using: with-browser = $WANT_CIN_BROWSER" -echo " using: with-plugin-dir = $WANT_PLUGIN_DIR" -echo " using: with-ladspa-dir = $WANT_LADSPA_DIR" -echo " using: with-opencv = $WANT_OPENCV" -echo " using: with-git-ffmpeg = $WANT_GIT_FFMPEG" -echo " using: with-noelision = $WANT_NOELISION" -echo " using: with-booby = $WANT_BOOBY" -echo " using: with-libzmpeg = $WANT_LIBZMPEG" -echo " using: with-commerical = $WANT_COMMERCIAL" -echo " using: with-vaapi = $WANT_VAAPI" -echo " using: with-vdpau = $WANT_VDPAU" -echo " using: with-nv = $WANT_NV" -echo " using: with-cuda = $WANT_CUDA" -echo "" -echo " using: thirdparty build = $WANT_CIN_3RDPARTY" -echo " using: single-user = $WANT_CINBIN_BUILD" -echo " using: static-build = $WANT_STATIC_BUILD" -echo " using: ladspa-build = $WANT_LADSPA_BUILD" -echo "" - # build extras +if test "x$WANT_CLANG" = "xyes" ; then + FFMPEG_EXTRA_CFG+=' --cc=clang --cxx=clang++' +fi if test "x$HAVE_tiff" = "xyes"; then if test "x$HAVE_jbig" = "xyes"; then EXTRA_LIBS+=' -ljbig' @@ -919,8 +979,7 @@ FFMPEG_EXTRA_LDFLAGS="" if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then FFMPEG_EXTRA_LDFLAGS+=' -lva' EXTRA_LIBS+=' -lva' - WANT_VAPPI="yes" - CFG_WANTS+=" VAAPI" + WANT_VAAPI="yes" if test "x$HAVE_vaapi_x11" = "xyes"; then FFMPEG_EXTRA_LDFLAGS+=' -lva-x11' EXTRA_LIBS+=' -lva-x11' @@ -930,10 +989,13 @@ if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then EXTRA_LIBS+=' -lva-drm' fi fi +CFG_WANTS+=" VAAPI" + if test "x$WANT_VDPAU" != "xno" -a "x$HAVE_VDPAU" = "xyes"; then WANT_VDPAU="yes" - CFG_WANTS+=" VDPAU" fi +CFG_WANTS+=" VDPAU" + if test "x$WANT_NV" != "xno"; then WANT_NV="yes" CFG_WANTS+=" NV" @@ -961,6 +1023,28 @@ if test "x$WANT_NOELISION" != "xno"; then | tail -1` fi +echo " using: with-jobs = $WANT_JOBS" +echo " using: exec-name = $WANT_CIN" +echo " using: with-cinlib = $WANT_CINLIB_DIR" +echo " using: with-cindat = $WANT_CINDAT_DIR" +echo " using: with-config-dir = $WANT_CONFIG_DIR" +echo " using: with-nested-dir = $WANT_NESTED_DIR" +echo " using: with-snap-dir = $WANT_SNAP_DIR" +echo " using: with-browser = $WANT_CIN_BROWSER" +echo " using: with-plugin-dir = $WANT_PLUGIN_DIR" +echo " using: with-ladspa-dir = $WANT_LADSPA_DIR" +echo " using: with-opencv = $WANT_OPENCV" +echo " using: with-git-ffmpeg = $WANT_GIT_FFMPEG" +echo " using: with-noelision = $WANT_NOELISION" +echo " using: with-booby = $WANT_BOOBY" +echo " using: with-clang = $WANT_CLANG" +echo "" +echo " using: thirdparty build = $WANT_CIN_3RDPARTY" +echo " using: single-user = $WANT_CINBIN_BUILD" +echo " using: static-build = $WANT_STATIC_BUILD" +echo " using: ladspa-build = $WANT_LADSPA_BUILD" +echo "" + AC_SUBST(WANT_CIN_3RDPARTY) AC_SUBST(EXTRA_LIBS) AC_SUBST(FFMPEG_EXTRA_CFG) @@ -978,6 +1062,11 @@ exec > global_config echo "SHELL := /bin/bash" echo "export SHELL" echo "WANT_JOBS := $WANT_JOBS" +if test "x$WANT_CLANG" = "xyes" ; then + echo "CC = clang" + echo "CXX = clang++" + echo "export CC CXX" +fi echo "" echo "OBJDIR := $OBJDIR" echo "BINDIR := \$(TOPDIR)/bin" @@ -997,7 +1086,7 @@ echo "export THIRDPARTY EXTRA_LIBS FFMPEG_EXTRA_CFG" echo "" echo "WANT_CIN := $WANT_CIN" -CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL" +CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL STATIC_BUILD" for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done echo "" @@ -1024,6 +1113,8 @@ echo "CFLAGS += '-DCIN=\"\$(WANT_CIN)\"'" echo "CFLAGS += '-DCINLIB_DIR=\"$WANT_CINLIB_DIR\"'" echo "CFLAGS += '-DCINDAT_DIR=\"$WANT_CINDAT_DIR\"'" echo "CFLAGS += '-DCONFIG_DIR=\"$WANT_CONFIG_DIR\"'" +echo "CFLAGS += '-DNESTED_DIR=\"$WANT_NESTED_DIR\"'" +echo "CFLAGS += '-DSNAP_DIR=\"$WANT_SNAP_DIR\"'" echo "CFLAGS += '-DPLUGIN_DIR=\"$WANT_PLUGIN_DIR\"'" echo "CFLAGS += '-DLOCALE_DIR=\"$WANT_LOCALE_DIR\"'" echo "CFLAGS += '-DLADSPA_DIR=\"$WANT_LADSPA_DIR\"'" @@ -1039,6 +1130,27 @@ if test "x$CFG_LDFLAGS" != "x" ; then echo "" fi +if test "x$CYGWIN" != "x" ; then + echo 'FF_PATH ?= /usr/local' + echo 'LDFLAGS += -L$(FF_PATH)/lib' + echo 'CFLAGS += -I$(FF_PATH)/include' + echo "" + echo "CFLAGS += -DNO_BTRACE" + echo "CFLAGS += -DNO_GDB" + echo "CFLAGS += -DNO_CTX" + echo "CFLAGS += -DNO_PRCTL" + echo "CFLAGS += -DNO_TID" + echo "CFLAGS += -DNO_XSELECT" + echo "" +else + LDFLAGS+=" -z noexecstack" +fi +if test "x$BSD" != "x" ; then + echo "CFLAGS += -DNO_PRCTL" + echo "CFLAGS += -DNO_TID" + echo "CFLAGS += -DNO_GDB" +fi + if test "x$WANT_X264_HIDEPTH" = "xyes" ; then X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10" fi @@ -1048,8 +1160,11 @@ fi for pkg in $STATIC_PKGS; do eval pkg_lib="\$PKG_$pkg" - if test "x$pkg_lib" = "xno"; then continue; fi; - echo "static_pkgs += $pkg" + if test "x$pkg_lib" = "xyes"; then + echo "static_pkgs += $pkg" + elif test "x$pkg_lib" = "xshared"; then + echo "shared_pkgs += $pkg" + fi done echo "" @@ -1078,7 +1193,7 @@ echo "" for lib in $SHARED_LIBS; do echo "shared_libs += $lib"; done echo "" for lib in $SYSTEM_LIBS; do echo "system_libs += $lib"; done -echo "export static_pkgs static_blds shared_libs system_libs" +echo "export static_pkgs shared_pkgs static_blds shared_libs system_libs" echo "" echo "thirdparty_libraries := \$(static_libs) \$(shared_libs)" @@ -1089,11 +1204,13 @@ fi echo "libraries += -Wl,--start-group" echo "libraries += \$(thirdparty_libraries)" +echo "libraries += \$(shared_libs)" echo "libraries += \$(system_libs)" echo "libraries += \$(EXTRA_LIBS)" echo "libraries += -Wl,--end-group" # -Wl,--start-group ... -Wl,--end-group does not work on ubuntu echo "libraries += \$(thirdparty_libraries)" +echo "libraries += \$(shared_libs)" echo "libraries += \$(system_libs)" echo "libraries += \$(EXTRA_LIBS)" echo "" @@ -1116,3 +1233,4 @@ fi if test "x$X265_CFG_PARAMS" != "x" ; then echo "x265.cfg_params :=$X265_CFG_PARAMS -DENABLE_SHARED=no" fi +