From 82d3b9466e2996d1737cf4d5612c49c3bd031760 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 24 Mar 2007 16:27:25 +0000 Subject: 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 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index df623c64bd..afc4f7491b 100644 --- a/Makefile +++ b/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) -- cgit v1.2.3