Mercurial > mplayer.hg

diff Makefile @ 21473:6e03eb6af0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author diego
date Mon, 04 Dec 2006 11:59:23 +0000
parents 254e55a37c6d
children 6c940c707bd7
line wrap: on
line diff
--- a/Makefile	Mon Dec 04 10:24:00 2006 +0000
+++ b/Makefile	Mon Dec 04 11:59:23 2006 +0000
@@ -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