Skip to content

V
vlc
Commit a68a736b authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: enforce compilation settings for x264 and lua, too

parent 1b48ec75
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
extras/contrib/src/Makefile
View file @ a68a736b
...@@ -145,6 +145,7 @@ FFMPEGCONF += --enable-memalign-hack ...@@ -145,6 +145,7 @@ FFMPEGCONF += --enable-memalign-hack
endif endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
X264CONF=--host=$(HOST)
X264CONF += --enable-pic X264CONF += --enable-pic
FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --cc=$(CC)
FFMPEGCONF += --arch=$(ARCH) FFMPEGCONF += --arch=$(ARCH)
...@@ -656,6 +657,9 @@ lua-$(LUA_VERSION).tar.gz: ...@@ -656,6 +657,9 @@ lua-$(LUA_VERSION).tar.gz:
lua: lua-$(LUA_VERSION).tar.gz lua: lua-$(LUA_VERSION).tar.gz
$(EXTRACT_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 .lua: lua
ifdef HAVE_WIN32 ifdef HAVE_WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment