Commit 99e59bbe authored by bitmap's avatar bitmap

Fix cross compile of x264. The --crosscompile switch being added by the patch...

Fix cross compile of x264. The --crosscompile switch being added by the patch doesn't appear to have worked for some time.
parent 2cde647a
...@@ -102,7 +102,7 @@ ifneq ($(BUILD),$(HOST)) ...@@ -102,7 +102,7 @@ ifneq ($(BUILD),$(HOST))
ifndef HAVE_CYGWIN ifndef HAVE_CYGWIN
# We are REALLY cross compiling # We are REALLY cross compiling
FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile
X264CONF=--crosscompile=$(HOST) X264CONF=--host=$(HOST)
PTHREADSCONF="CROSS=$(HOST)-" PTHREADSCONF="CROSS=$(HOST)-"
else else
# We are compiling for MinGW on Cygwin # We are compiling for MinGW on Cygwin
...@@ -1328,10 +1328,10 @@ endif ...@@ -1328,10 +1328,10 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
.x264: x264 .pthreads .x264: x264 .pthreads
(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
else else
.x264: x264 .x264: x264
(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
endif endif
touch $@ touch $@
......
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