diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-04 11:59:23 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-04 11:59:23 +0000 |
commit | cde348cd4720415b7616523ef0b2aa98eb8442e2 (patch) | |
tree | dd2525a51d43ce178bb0a778054cbea37161fa87 /Makefile | |
parent | 11e03076eb022cfa4e3be9309c3f42d9488ba58a (diff) | |
download | mpv-cde348cd4720415b7616523ef0b2aa98eb8442e2.tar.bz2 mpv-cde348cd4720415b7616523ef0b2aa98eb8442e2.tar.xz |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |