Mercurial > mplayer.hg
comparison Makefile @ 19558:607b12d19eed
Move MLIB_LIB to COMMON_LIBS.
author | diego |
---|---|
date | Sun, 27 Aug 2006 22:35:07 +0000 |
parents | e32250c3db9a |
children | b251bca5820c |
comparison
equal
deleted
inserted
replaced
19557:3a5d02f156d3 | 19558:607b12d19eed |
---|---|
69 | 69 |
70 VO_LIBS = $(AA_LIB) \ | 70 VO_LIBS = $(AA_LIB) \ |
71 $(X_LIB) \ | 71 $(X_LIB) \ |
72 $(SDL_LIB) \ | 72 $(SDL_LIB) \ |
73 $(GGI_LIB) \ | 73 $(GGI_LIB) \ |
74 $(MLIB_LIB) \ | |
75 $(SVGA_LIB) \ | 74 $(SVGA_LIB) \ |
76 $(DIRECTFB_LIB) \ | 75 $(DIRECTFB_LIB) \ |
77 $(CACA_LIB) \ | 76 $(CACA_LIB) \ |
78 $(VESA_LIB) \ | 77 $(VESA_LIB) \ |
79 | 78 |
138 $(TERMCAP_LIB) \ | 137 $(TERMCAP_LIB) \ |
139 $(CDPARANOIA_LIB) \ | 138 $(CDPARANOIA_LIB) \ |
140 $(MPLAYER_NETWORK_LIB) \ | 139 $(MPLAYER_NETWORK_LIB) \ |
141 $(LIBCDIO_LIB) \ | 140 $(LIBCDIO_LIB) \ |
142 $(WIN32_LIB) \ | 141 $(WIN32_LIB) \ |
142 $(MLIB_LIB) \ | |
143 $(GIF_LIB) \ | 143 $(GIF_LIB) \ |
144 $(MACOSX_FRAMEWORKS) \ | 144 $(MACOSX_FRAMEWORKS) \ |
145 $(SMBSUPPORT_LIB) \ | 145 $(SMBSUPPORT_LIB) \ |
146 $(FRIBIDI_LIB) \ | 146 $(FRIBIDI_LIB) \ |
147 $(ENCA_LIB) \ | 147 $(ENCA_LIB) \ |
387 | 387 |
388 ifeq ($(MENCODER),yes) | 388 ifeq ($(MENCODER),yes) |
389 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ | 389 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ |
390 $(ENCORE_LIB) \ | 390 $(ENCORE_LIB) \ |
391 $(COMMON_LIBS) \ | 391 $(COMMON_LIBS) \ |
392 $(MLIB_LIB) \ | |
393 | 392 |
394 $(PRG_MENCODER): $(MENCODER_DEP) | 393 $(PRG_MENCODER): $(MENCODER_DEP) |
395 $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER) | 394 $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER) |
396 endif | 395 endif |
397 | 396 |