From: Felix Paul Kühne Date: Sat, 27 Dec 2008 18:48:14 +0000 (+0100) Subject: contrib: tweaked a few lines to make 64bit compilation possible on Macs X-Git-Tag: 1.0.0-pre1~1661 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=cac27358067ff3fb20ec4391a93af9e1bd31d6ab contrib: tweaked a few lines to make 64bit compilation possible on Macs --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 683b31631b..6b4dc5bd3f 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -136,11 +136,12 @@ FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif ifdef HAVE_DARWIN_OS_ON_INTEL -FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m +FFMPEGCONF += --enable-memalign-hack endif ifdef HAVE_DARWIN_OS X264CONF += --enable-pic +FFMPEGCONF += --arch=$(ARCH) ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF endif @@ -469,7 +470,7 @@ ifdef HAVE_WIN32 endif else ifdef HAVE_DARWIN_OS - (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/usr/X11/var/cache/fontconfig --with-confdir=/usr/X11/lib/X11/fonts --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR)) + (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/usr/X11/var/cache/fontconfig --with-confdir=/usr/X11/lib/X11/fonts --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --with-arch=$(ARCH) --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR)) else (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) endif