diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-12 23:06:09 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-12 23:06:09 +0000 |
commit | e8954b5bf9beb6e80f8cb304826d570090b277e7 (patch) | |
tree | 108870108def648b1b6086ddb20626748ade3106 | |
parent | bea8281d3d0f47f354c1c74d1f33b187c82fb1c8 (diff) | |
download | mpv-e8954b5bf9beb6e80f8cb304826d570090b277e7.tar.bz2 mpv-e8954b5bf9beb6e80f8cb304826d570090b277e7.tar.xz |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17842 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | codec-cfg.c | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -448,7 +448,7 @@ $(MPLAYER_DEP): version.h help_mp.h $(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) diff --git a/codec-cfg.c b/codec-cfg.c index 7fc45e5ba7..588baa06b0 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -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" |