diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:10:06 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:10:06 +0200 |
| commit | 323890871d9a4d5bed8a38b1b676590ce614d87a (patch) | |
| tree | 6f3bf40178c9f2891bfc6cfdf3837e42594bf09a | |
| parent | 2ca2bf4079300b7f65bcc5bcdf7c9f4ef2e7a161 (diff) | |
| download | mpv-323890871d9a4d5bed8a38b1b676590ce614d87a.tar.bz2 mpv-323890871d9a4d5bed8a38b1b676590ce614d87a.tar.xz | |
build: remove separate mp_msg-mencoder.c
mp_msg-mencoder.c was separate from mp_msg.c only to compile a version
without a GUI dependency when the internal GUI was enabled. Since the
GUI has been removed the same mp_msg.o can be linked in all binaries.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | mp_msg-mencoder.c | 3 |
2 files changed, 2 insertions, 6 deletions
@@ -332,6 +332,7 @@ SRCS_COMMON = asxparser.c \ m_config.c \ m_option.c \ m_struct.c \ + mp_msg.c \ mpcommon.c \ parser-cfg.c \ playtree.c \ @@ -622,7 +623,6 @@ SRCS_MPLAYER = command.c \ m_property.c \ mixer.c \ mp_fifo.c \ - mp_msg.c \ mplayer.c \ parser-mpcmd.c \ input/input.c \ @@ -654,7 +654,6 @@ SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c SRCS_MENCODER = mencoder.c \ - mp_msg-mencoder.c \ parser-mecmd.c \ xvid_vbr.c \ libmpcodecs/ae.c \ @@ -900,7 +899,7 @@ generated_ebml: ###### tests / tools ####### -TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ diff --git a/mp_msg-mencoder.c b/mp_msg-mencoder.c deleted file mode 100644 index d295020364..0000000000 --- a/mp_msg-mencoder.c +++ /dev/null @@ -1,3 +0,0 @@ - -#define FOR_MENCODER 1 -#include "mp_msg.c" |