mirror of
https://github.com/mpv-player/mpv
synced 2025-03-24 12:22:25 +00:00
Move the generation of OBJS_* from SRCS_* up before the addition of OBJS_*-yes
to OBJS_*. The content of OBJS_*-yes was getting clobbered. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22862 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
181b648489
commit
7bbb6e7043
8
Makefile
8
Makefile
@ -91,6 +91,10 @@ OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
||||
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
||||
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
||||
|
||||
OBJS_COMMON = $(SRCS_COMMON:.c=.o)
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
SRCS_COMMON += $(SRCS_COMMON-yes)
|
||||
COMMON_LIBS += $(COMMON_LIBS-yes)
|
||||
LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
|
||||
@ -98,10 +102,6 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
|
||||
PARTS += $(PARTS-yes)
|
||||
ALL_PRG += $(ALL_PRG-yes)
|
||||
|
||||
OBJS_COMMON = $(SRCS_COMMON:.c=.o)
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
COMMON_LIBS += osdep/libosdep.a
|
||||
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||
|
Loading…
Reference in New Issue
Block a user