Skip to content

V
vlc-1.1
Commit f83418ee authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

[Contribs] Small FFMPEGCONF cleanup.

parent c7d9a5cd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
extras/contrib/src/Makefile
View file @ f83418ee
...@@ -84,14 +84,9 @@ else ...@@ -84,14 +84,9 @@ else
HOSTCC2=$(HOSTCC) HOSTCC2=$(HOSTCC)
endif endif
# For ffmpeg if not cross compiling FFMPEGCONF=
ifneq ($(CC),)
FFMPEGCONF=--cc="$(CC)"
endif
#
# cross compiling # cross compiling
#
#This should be inside the if block but some config scripts are buggy #This should be inside the if block but some config scripts are buggy
HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix="" HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix=""
ifneq ($(BUILD),$(HOST)) ifneq ($(BUILD),$(HOST))
...@@ -101,7 +96,7 @@ ifneq ($(BUILD),$(HOST)) ...@@ -101,7 +96,7 @@ ifneq ($(BUILD),$(HOST))
# #
ifndef HAVE_CYGWIN ifndef HAVE_CYGWIN
# We are REALLY cross compiling # We are REALLY cross compiling
FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile
X264CONF=--host=$(HOST) X264CONF=--host=$(HOST)
PTHREADSCONF="CROSS=$(HOST)-" PTHREADSCONF="CROSS=$(HOST)-"
else else
......
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