Commit 3ffe4a5c authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Compile x264 with pic enabled. (how logical :D)

parent 9fa3745b
...@@ -3371,9 +3371,6 @@ if test "${enable_x264}" != "no"; then ...@@ -3371,9 +3371,6 @@ if test "${enable_x264}" != "no"; then
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_BUILTINS([x264]) VLC_ADD_BUILTINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264]) VLC_ADD_LDFLAGS([x264],[-lx264])
if test "${SYS}" = "darwin"; then
VLC_ADD_LDFLAGS([x264],[-read_only_relocs warning])
fi
],[ ],[
AC_MSG_ERROR([the specified tree hasn't been compiled]) AC_MSG_ERROR([the specified tree hasn't been compiled])
]) ])
...@@ -3388,9 +3385,6 @@ if test "${enable_x264}" != "no"; then ...@@ -3388,9 +3385,6 @@ if test "${enable_x264}" != "no"; then
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_PLUGINS([x264]) VLC_ADD_PLUGINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264]) VLC_ADD_LDFLAGS([x264],[-lx264])
if test "${SYS}" = "darwin"; then
VLC_ADD_LDFLAGS([x264],[-read_only_relocs warning])
fi
],[ ],[
if test "${enable_x264}" = "yes"; then if test "${enable_x264}" = "yes"; then
AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html]) AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
......
...@@ -1209,7 +1209,7 @@ endif ...@@ -1209,7 +1209,7 @@ endif
endif endif
.x264: x264 .x264: x264
(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pic && make && make install)
touch $@ touch $@
CLEAN_FILE += .x264 CLEAN_FILE += .x264
......
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