mirror of
https://github.com/mpv-player/mpv
synced 2024-10-26 07:22:17 +02:00
Move the addition of osdep/mplayer-rc.o to a place where it actually gets added to OBJS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22808 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
f4f37679b5
commit
82d3b9466e
6
Makefile
6
Makefile
@ -114,6 +114,9 @@ PARTS-$(GUI) += Gui
|
||||
LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a
|
||||
PARTS-$(LIBMENU) += libmenu
|
||||
|
||||
# Having this in libosdep.a is not enough.
|
||||
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
||||
|
||||
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
||||
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
||||
|
||||
@ -128,9 +131,6 @@ OBJS_COMMON = $(SRCS_COMMON:.c=.o)
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
# Having this in libosdep.a is not enough.
|
||||
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
||||
|
||||
COMMON_LIBS += osdep/libosdep.a
|
||||
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||
|
Loading…
Reference in New Issue
Block a user