Mercurial > mplayer.hg
changeset 22790:d1e8f85138e7
Move the addition of osdep/mplayer-rc.o to a place where it actually gets added to OBJS_MPLAYER.
| author | diego |
|---|---|
| date | Sat, 24 Mar 2007 16:27:25 +0000 |
| parents | 12ae53050d94 |
| children | 39cdbfe7d24e |
| files | Makefile |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Mar 24 16:06:22 2007 +0000 +++ b/Makefile Sat Mar 24 16:27:25 2007 +0000 @@ -114,6 +114,9 @@ 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_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)