diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 16:27:25 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-24 16:27:25 +0000 |
| commit | 82d3b9466e2996d1737cf4d5612c49c3bd031760 (patch) | |
| tree | dcb9b71198cdb6d2518c3c163acbcf4fabc5dfb4 /Makefile | |
| parent | f4f37679b558184ec83d4c3946b483079a670b4f (diff) | |
| download | mpv-82d3b9466e2996d1737cf4d5612c49c3bd031760.tar.bz2 mpv-82d3b9466e2996d1737cf4d5612c49c3bd031760.tar.xz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) |