[vlc-devel] commit: contribs: enforce compilation settings for x264 and lua, too ( Felix Paul Kühne )

git version control git at videolan.org
Sat Aug 1 14:46:32 CEST 2009


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Aug  1 14:46:23 2009 +0200| [a68a736bff69666437b08014b0e5875ed530ac77] | committer: Felix Paul Kühne 

contribs: enforce compilation settings for x264 and lua, too

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a68a736bff69666437b08014b0e5875ed530ac77
---

 extras/contrib/src/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 15131a8..76f6ea7 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -145,6 +145,7 @@ FFMPEGCONF += --enable-memalign-hack
 endif
 
 ifdef HAVE_DARWIN_OS
+X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
 FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
@@ -656,6 +657,9 @@ lua-$(LUA_VERSION).tar.gz:
 
 lua: lua-$(LUA_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+	(cd $@; sed -e 's%gcc%$(CC)%' -e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  src/Makefile)
+endif
 
 .lua: lua
 ifdef HAVE_WIN32




More information about the vlc-devel mailing list