[MPlayer-dev-eng] [PATCH] standalone codec-cfg: remove mp_msg dependency

[Reimar Döffinger]

Hi,
currently codec-cfg does not compile anymore on MinGW, because it uses
mp_msg but does not link to libiconv.
The attached patch removes the dependency to mp_msg.c, which I find the
best solution. Okay to commit?

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.348
diff -u -r1.348 Makefile
--- Makefile	8 Mar 2006 19:52:51 -0000	1.348
+++ Makefile	11 Mar 2006 09:07:03 -0000
@@ -448,7 +448,7 @@
 $(MENCODER_DEP): version.h help_mp.h
 
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
-	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
+	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
 
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.126
diff -u -r1.126 codec-cfg.c
--- codec-cfg.c	7 Mar 2006 15:40:49 -0000	1.126
+++ codec-cfg.c	11 Mar 2006 09:07:05 -0000
@@ -26,6 +26,13 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#ifdef CODECS2HTML
+#ifdef __GNUC__
+#define mp_msg(t, l, m, args...) fprintf(stderr, m, ##args)
+#else
+#define mp_msg(t, l, m, ...) fprintf(stderr, m, __VA_ARGS__)
+#endif
+#endif
 
 #include "help_mp.h"