X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=a35ab37800b9640f1d9a0b9d28006e4271c70e4a;hb=17e433a6e5021cc080101fd88ac3236dacb9f2e8;hp=09e872cc550db4f92e9a09869529d9c56249008c;hpb=7f3ab16b8472cbb67f8b476d6e8f645904797023;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 09e872cc..a35ab378 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -105,7 +105,7 @@ esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" faac.cfg_params= --enable-shared=no --without-mp4v2 faad2.cfg_params= --enable-shared=no -fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing" +#fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing" fdk.cfg_params= --enable-shared=no fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s . $$$$f/fdk-aac; done fftw.cfg_params= --disable-fortran --enable-shared=no @@ -113,7 +113,6 @@ ffmpeg.cfg_params= \ --enable-pthreads --enable-gpl \ --disable-ffserver --disable-ffplay \ --disable-vaapi \ - --enable-libfaac \ --enable-libfdk-aac \ --enable-libtwolame \ --enable-libopenjpeg \ @@ -195,7 +194,7 @@ libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394 libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis) libtheora.cflags?="$(call inc_path,libogg,include) $(call inc_path,libogg,src) $(call inc_path,libvorbis,include)" libtheora.ldflags?="$(call ld_path,libvorbis,lib/.libs) $(call ld_path,libogg,src/.libs)" -libtheora.cfg_params?= --disable-examples --enable-shared=no +libtheora.cfg_params?= --disable-examples --disable-spec --enable-shared=no libuuid.cfg_params?=--enable-shared=no libvorbis.cfg_params?= --disable-oggtest --enable-shared=no openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF