mirror of https://github.com/mpv-player/mpv
Handle common parts at the objects instead of at the sources level.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22542 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
f07e14645d
commit
1e4055ebdd
7
Makefile
7
Makefile
|
@ -36,7 +36,6 @@ SRCS_COMMON-$(UNRARLIB) += unrarlib.c
|
||||||
SRCS_MPLAYER = mplayer.c \
|
SRCS_MPLAYER = mplayer.c \
|
||||||
m_property.c \
|
m_property.c \
|
||||||
mp_msg.c \
|
mp_msg.c \
|
||||||
$(SRCS_COMMON) \
|
|
||||||
mixer.c \
|
mixer.c \
|
||||||
parser-mpcmd.c \
|
parser-mpcmd.c \
|
||||||
subopt-helper.c \
|
subopt-helper.c \
|
||||||
|
@ -44,7 +43,6 @@ SRCS_MPLAYER = mplayer.c \
|
||||||
|
|
||||||
SRCS_MENCODER = mencoder.c \
|
SRCS_MENCODER = mencoder.c \
|
||||||
mp_msg-mencoder.c \
|
mp_msg-mencoder.c \
|
||||||
$(SRCS_COMMON) \
|
|
||||||
parser-mecmd.c \
|
parser-mecmd.c \
|
||||||
xvid_vbr.c \
|
xvid_vbr.c \
|
||||||
|
|
||||||
|
@ -62,14 +60,15 @@ LIBS_MPLAYER = libvo/libvo.a \
|
||||||
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
||||||
libmpdemux/libmpmux.a \
|
libmpdemux/libmpmux.a \
|
||||||
|
|
||||||
|
OBJS_COMMON = $(SRCS_COMMON:.c=.o)
|
||||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||||
|
|
||||||
# Having this in libosdep.a is not enough.
|
# Having this in libosdep.a is not enough.
|
||||||
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
||||||
|
|
||||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||||
MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
|
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
|
||||||
|
|
||||||
PARTS = libmpdemux \
|
PARTS = libmpdemux \
|
||||||
stream \
|
stream \
|
||||||
|
|
Loading…
Reference in New Issue