Mercurial > mplayer.hg
comparison Makefile @ 19482:a917f318c1b7
Simplify VIDIX lib handling.
| author | diego |
|---|---|
| date | Mon, 21 Aug 2006 21:50:52 +0000 |
| parents | 317f91100cb1 |
| children | fa86e7d57d1b |
comparison
equal
deleted
inserted
replaced
| 19481:5890c54b755c | 19482:a917f318c1b7 |
|---|---|
| 68 $(SVGA_LIB) \ | 68 $(SVGA_LIB) \ |
| 69 $(DIRECTFB_LIB) \ | 69 $(DIRECTFB_LIB) \ |
| 70 $(CACA_LIB) \ | 70 $(CACA_LIB) \ |
| 71 $(VESA_LIB) \ | 71 $(VESA_LIB) \ |
| 72 | 72 |
| 73 ifeq ($(VIDIX),yes) | |
| 74 VO_LIBS += vidix/libvidix.a | |
| 75 endif | |
| 73 ifeq ($(EXTERNAL_VIDIX),yes) | 76 ifeq ($(EXTERNAL_VIDIX),yes) |
| 74 VO_LIBS += $(EXTERNAL_VIDIX_LIB) | 77 VO_LIBS += $(EXTERNAL_VIDIX_LIB) |
| 75 endif | 78 endif |
| 76 | 79 |
| 77 AO_LIBS = $(ARTS_LIB) \ | 80 AO_LIBS = $(ARTS_LIB) \ |
| 353 MENU_LIBS = | 356 MENU_LIBS = |
| 354 endif | 357 endif |
| 355 | 358 |
| 356 MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a | 359 MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a |
| 357 | 360 |
| 358 ifeq ($(VIDIX),yes) | |
| 359 VIDIX_LIBS = vidix/libvidix.a | |
| 360 else | |
| 361 VIDIX_LIBS = | |
| 362 endif | |
| 363 | |
| 364 ifeq ($(TARGET_WIN32),yes) | 361 ifeq ($(TARGET_WIN32),yes) |
| 365 OBJS_MPLAYER += osdep/mplayer-rc.o | 362 OBJS_MPLAYER += osdep/mplayer-rc.o |
| 366 endif | 363 endif |
| 367 | 364 |
| 368 LIBS_MPLAYER = libvo/libvo.a \ | 365 LIBS_MPLAYER = libvo/libvo.a \ |
| 369 libao2/libao2.a \ | 366 libao2/libao2.a \ |
| 370 input/libinput.a \ | 367 input/libinput.a \ |
| 371 $(MENU_LIBS) \ | 368 $(MENU_LIBS) \ |
| 372 $(VIDIX_LIBS) \ | |
| 373 $(GUI_LIBS) \ | 369 $(GUI_LIBS) \ |
| 374 $(COMMON_LIBS) \ | 370 $(COMMON_LIBS) \ |
| 375 $(VO_LIBS) \ | 371 $(VO_LIBS) \ |
| 376 $(AO_LIBS) \ | 372 $(AO_LIBS) \ |
| 377 $(EXTRA_LIB)\ | 373 $(EXTRA_LIB)\ |