Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
21472:b52664db931c 21473:6e03eb6af0b7
65 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ 65 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
66 libmpdemux/libmpmux.a \ 66 libmpdemux/libmpmux.a \
67 67
68 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 68 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
69 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) 69 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
70
71 # Having this in libosdep.a is not enough.
72 OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
70 73
71 MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS) 74 MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS)
72 MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS) 75 MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
73 76
74 PARTS = libmpdemux \ 77 PARTS = libmpdemux \
218 $(MAKE) -C Gui 221 $(MAKE) -C Gui
219 222
220 osdep/libosdep.a: 223 osdep/libosdep.a:
221 $(MAKE) -C osdep 224 $(MAKE) -C osdep
222 225
226 osdep/mplayer-rc.o:
227 $(MAKE) -C osdep
228
223 input/libinput.a: 229 input/libinput.a:
224 $(MAKE) -C input 230 $(MAKE) -C input
225 231
226 libmenu/libmenu.a: 232 libmenu/libmenu.a:
227 $(MAKE) -C libmenu 233 $(MAKE) -C libmenu