vlc | branch: master | Pierre d'Herbemont <pdherbem...@free.fr> | Fri Nov 5 23:05:26 2010 +0100| [ab68dc8645db94d0643dd982a4fb6080aa13b5dc] | committer: Pierre d'Herbemont
contrib: Group pthread and x264 settings together. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab68dc8645db94d0643dd982a4fb6080aa13b5dc --- extras/contrib/src/contrib-src.mak | 39 +++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index 6730f78..0de29d8 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -104,8 +104,6 @@ ifneq ($(BUILD),$(HOST)) ifndef HAVE_IOS HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX=y endif - X264CONF=--host=$(HOST) - PTHREADSCONF=CROSS="$(HOST)-" else # We are compiling for MinGW on Cygwin endif @@ -122,13 +120,6 @@ ifdef HAVE_WINCE HOSTCONF+= --without-pic --disable-shared endif -ifdef HAVE_MACOSX -X264CONF=--host=$(HOST) -X264CONF += --enable-pic -ifdef HAVE_MACOSX64 -X264CONF+=--host=x86_64-apple-MACOSX10 -endif -endif ifdef HAVE_LINUX ifdef HAVE_MAEMO @@ -136,15 +127,13 @@ ifdef HAVE_MAEMO # Installing statically-linked VLC plugins is so much simpler. HOSTCONF += --with-pic --disable-shared endif -X264CONF += --enable-pic endif + ifdef HAVE_ISA_THUMB NOTHUMB ?= -mno-thumb endif -X264CONF+= --disable-avs --disable-lavf --disable-ffms --disable-mp4-output - DATE=`date +%Y-%m-%d` # *************************************************************************** @@ -976,10 +965,10 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 FFMPEGCONF=--disable-doc --disable-decoder=libvpx ifdef HAVE_CROSS_COMPILE - FFMPEGCONF += --enable-cross-compile +FFMPEGCONF += --enable-cross-compile endif ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX - FFMPEGCONF += --cross-prefix=$(HOST)- +FFMPEGCONF += --cross-prefix=$(HOST)- endif # @@ -1420,6 +1409,24 @@ DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2 # libx264 # *************************************************************************** +ifdef HAVE_MACOSX +X264CONF =--host=$(HOST) +X264CONF += --enable-pic +ifdef HAVE_MACOSX64 +X264CONF +=--host=x86_64-apple-MACOSX10 +endif +endif + +ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX +X264CONF=--host=$(HOST) +endif + +ifdef HAVE_LINUX +X264CONF += --enable-pic +endif + +X264CONF += --disable-avs --disable-lavf --disable-ffms --disable-mp4-output + x264-$(X264_VERSION).tar.gz: $(WGET) $(X264_URL) @@ -2268,6 +2275,10 @@ DISTCLEAN_PKG += taglib-$(TAGLIB_VERSION).tar.gz # pthreads for win32 # *************************************************************************** +ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX +PTHREADSCONF=CROSS="$(HOST)-" +endif + pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz: $(WGET) $(PTHREADS_URL) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
