[MPlayer-cvslog] CVS: main Makefile, 1.348, 1.349 codec-cfg.c, 1.126, 1.127

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv23725

Modified Files:
	Makefile codec-cfg.c 
Log Message:
remove mp_msg.c dependency when compiling codec-cfg binary.
Fixes MinGW compilation (caused by missing -liconv), this solution seems best
to me because of e.g. cross-compilation issues just adding -liconv might cause.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- Makefile	8 Mar 2006 19:52:51 -0000	1.348
+++ Makefile	12 Mar 2006 23:06:09 -0000	1.349
@@ -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
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- codec-cfg.c	7 Mar 2006 15:40:49 -0000	1.126
+++ codec-cfg.c	12 Mar 2006 23:06:09 -0000	1.127
@@ -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"