diff options
author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /configure | |
parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
download | mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2 mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -472,7 +472,6 @@ Miscellaneous options: --enable-runtime-cpudetection enable runtime CPU detection [disable] --enable-cross-compile enable cross-compilation [disable] --cc=COMPILER C compiler to build MPlayer [gcc] - --host-cc=COMPILER C compiler for tools needed while building [gcc] --as=ASSEMBLER assembler to build MPlayer [as] --nm=NM nm tool to build MPlayer [nm] --yasm=YASM Yasm assembler to build MPlayer [yasm] @@ -776,9 +775,6 @@ for ac_option do --cc=*) _cc=$(echo $ac_option | cut -d '=' -f 2) ;; - --host-cc=*) - _host_cc=$(echo $ac_option | cut -d '=' -f 2) - ;; --as=*) _as=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -1211,7 +1207,6 @@ if test $_cross_compile = yes; then tmp_run() { return 0 } - test "$_host_cc" || _host_cc=cc fi tool_prefix="" @@ -1475,10 +1470,6 @@ EOF cc_check && host_arch=x86_64 || host_arch=i386 fi -echocheck "host cc" -test "$_host_cc" || _host_cc=$_cc -echores $_host_cc - echo "Detected operating system: $system_name" echo "Detected host architecture: $host_arch" @@ -6257,7 +6248,6 @@ AR = $_ar AS = $_cc CC = $_cc CXX = $_cc -HOST_CC = $_host_cc INSTALL = $_install INSTALLSTRIP = $_install_strip WINDRES = $_windres |