Mercurial > mplayer.hg

changeset 26422:f74bff77f088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
noconfig fix, disable_gui_conf was not defined when compiling mencoder. Fix mencoder linking when the GUI is enabled. Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).
author albeu
date Tue, 15 Apr 2008 13:20:15 +0000
parents fb39a8d56dc2
children 38b8096cae32
files gui/cfg.c mpcommon.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/cfg.c	Tue Apr 15 02:02:29 2008 +0000
+++ b/gui/cfg.c	Tue Apr 15 13:20:15 2008 +0000
@@ -83,7 +83,7 @@
 
 extern int    stop_xscreensaver;
 extern int    m_config_parse_config_file(m_config_t* config, char *conffile);
-int disable_gui_conf=0;
+extern int    disable_gui_conf;
 
 static m_config_t * gui_conf;
 static const m_option_t gui_opts[] =
--- a/mpcommon.c	Tue Apr 15 02:02:29 2008 +0000
+++ b/mpcommon.c	Tue Apr 15 13:20:15 2008 +0000
@@ -210,7 +210,9 @@
 /* Parse -noconfig common to both programs */
 int disable_system_conf=0;
 int disable_user_conf=0;
-extern int disable_gui_conf;
+#ifdef HAVE_NEW_GUI
+int disable_gui_conf=0;
+#endif /* HAVE_NEW_GUI */
 
 /* Disable all configuration files */
 static void noconfig_all(void)