summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-07-02 02:35:57 +0300
committerUoti Urpala <uau@mplayer2.org>2012-07-16 21:08:42 +0300
commit2ba8b91a97e7e873a522f365e41a293af980c91a (patch)
tree40a17dd313350955ecdb285c06fbba005caa4ad9 /configure
parent39a45c7a175acf7ef5546073f62f5b9b7f83a893 (diff)
downloadmpv-2ba8b91a97e7e873a522f365e41a293af980c91a.tar.bz2
mpv-2ba8b91a97e7e873a522f365e41a293af980c91a.tar.xz
build, codec-cfg.c: simplify builtin codecs.conf handling
The player can read codec mapping (codecs.conf) from an external file or use embedded defaults. Before, the defaults were stored in the player binary in the form of final already-parsed data structures. Simplify things by storing the text of the codecs.conf file instead, and parse that at runtime the same way an external file would be parsed. To create the previous parsed form, the build system first compiled a separate binary named "codec-cfg", which parsed etc/codecs.conf and then wrote the results as a C data structure that could be compiled into the program. The new simple conversion of codecs.conf into a C string is handled by the new script TOOLS/file2string.py. After removing the codec-cfg binary, HOST_CC is no longer used for anything. Remove the --host-cc configure option and associated logic. Also remove the codec2html and codec-cfg-test functionality. Building those was already broken and nobody cared. There was a broken 3-character-long "fourcc" entry in etc/codecs.conf. This happened to be accepted before but triggered a parse error after the changes. Remove the broken entry and make the parsing functions explicitly test for this error.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 0 insertions, 10 deletions
diff --git a/configure b/configure
index a334b30922..5c1e288c42 100755
--- a/configure
+++ b/configure
@@ -471,7 +471,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]
@@ -774,9 +773,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)
;;
@@ -1207,7 +1203,6 @@ if test $_cross_compile = yes; then
tmp_run() {
return 0
}
- test "$_host_cc" || _host_cc=cc
fi
tool_prefix=""
@@ -1471,10 +1466,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"
@@ -6239,7 +6230,6 @@ AR = $_ar
AS = $_cc
CC = $_cc
CXX = $_cc
-HOST_CC = $_host_cc
INSTALL = $_install
INSTALLSTRIP = $_install_strip
WINDRES = $_windres