[MPlayer-cvslog] r21489 - in trunk: Makefile osdep/Makefile

[diego]

Author: diego
Date: Mon Dec  4 12:59:23 2006
New Revision: 21489

Modified:
   trunk/Makefile
   trunk/osdep/Makefile

Log:
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


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Dec  4 12:59:23 2006
@@ -68,6 +68,9 @@
 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 @@
 osdep/libosdep.a:
 	$(MAKE) -C osdep
 
+osdep/mplayer-rc.o:
+	$(MAKE) -C osdep
+
 input/libinput.a:
 	$(MAKE) -C input
 

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Mon Dec  4 12:59:23 2006
@@ -15,7 +15,6 @@
       mmap_anon.c \
 
 SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
-SRCS-$(TARGET_WIN32)          += mplayer-rc.c
 
 getch = getch2.c
 timer = timer-lx.c