Skip to content

Commit 3238908

Browse files
author
Uoti Urpala
committed
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.
1 parent 2ca2bf4 commit 3238908

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ SRCS_COMMON = asxparser.c \
332332
m_config.c \
333333
m_option.c \
334334
m_struct.c \
335+
mp_msg.c \
335336
mpcommon.c \
336337
parser-cfg.c \
337338
playtree.c \
@@ -622,7 +623,6 @@ SRCS_MPLAYER = command.c \
622623
m_property.c \
623624
mixer.c \
624625
mp_fifo.c \
625-
mp_msg.c \
626626
mplayer.c \
627627
parser-mpcmd.c \
628628
input/input.c \
@@ -654,7 +654,6 @@ SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
654654
SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
655655

656656
SRCS_MENCODER = mencoder.c \
657-
mp_msg-mencoder.c \
658657
parser-mecmd.c \
659658
xvid_vbr.c \
660659
libmpcodecs/ae.c \
@@ -900,7 +899,7 @@ generated_ebml:
900899

901900
###### tests / tools #######
902901

903-
TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
902+
TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
904903

905904
codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
906905
$(CC) -I. -DTESTING -o $@ $^

mp_msg-mencoder.c

-3
This file was deleted.

0 commit comments

Comments
 (0)