From cde348cd4720415b7616523ef0b2aa98eb8442e2 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 4 Dec 2006 11:59:23 +0000
Subject: [PATCH] Move the generation of osdep/mplayer-rc.o back to the
 top-level Makefile, having it as a part of osdep/libosdep.a is not enough.
 based on a patch by Zuxy Meng, zuxy.meng gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21489 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile       | 6 ++++++
 osdep/Makefile | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3348f9273c..5aa871c821 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,9 @@ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
 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
+
 MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(LIBS_MPLAYER)  $(COMMON_LIBS)
 MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
 
@@ -220,6 +223,9 @@ Gui/libgui.a:
 osdep/libosdep.a:
 	$(MAKE) -C osdep
 
+osdep/mplayer-rc.o:
+	$(MAKE) -C osdep
+
 input/libinput.a:
 	$(MAKE) -C input
 
diff --git a/osdep/Makefile b/osdep/Makefile
index 005bf0033e..0040ffd4ad 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -15,7 +15,6 @@ SRCS= shmem.c \
       mmap_anon.c \
 
 SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
-SRCS-$(TARGET_WIN32)          += mplayer-rc.c
 
 getch = getch2.c
 timer = timer-lx.c