changeset 17841:73db10d5f2e3

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.
author reimar
date Sun, 12 Mar 2006 23:06:09 +0000
parents 42843606bc06
children 7d5343254436
files Makefile codec-cfg.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Mar 12 22:29:27 2006 +0000
+++ b/Makefile	Sun Mar 12 23:06:09 2006 +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)
--- a/codec-cfg.c	Sun Mar 12 22:29:27 2006 +0000
+++ b/codec-cfg.c	Sun Mar 12 23:06:09 2006 +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"