From c4f39d2aba6f1f785648a2a96d147243cf944e12 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 2 Jan 2015 03:18:16 +0100 Subject: build: rename MPLAYER_CONFDIR define We certainly don't use the mplayer configuration dir. The name didn't matter, but now that it's in user-visible output (as part of config.h being dumped in verbose mode), it's a bit too strange. --- waftools/generators/headers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'waftools') diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py index 30a4e365e4..0046cbf75d 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -39,13 +39,13 @@ def __write_version_h__(ctx): def __escape_c_string(s): return s.replace("\"", "\\\"").replace("\n", "\\n") -def __add_mplayer_defines__(ctx): +def __add_mpv_defines__(ctx): from sys import argv ctx.define("CONFIGURATION", " ".join(argv)) - ctx.define("MPLAYER_CONFDIR", ctx.env.CONFDIR) + ctx.define("MPV_CONFDIR", ctx.env.CONFDIR) ctx.define("FULLCONFIG", "\\n" + __escape_c_string(ctx.get_config_header()) + "\\n") def configure(ctx): - __add_mplayer_defines__(ctx) + __add_mpv_defines__(ctx) __write_config_h__(ctx) __write_version_h__(ctx) -- cgit v1.2.3