diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /Makefile | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -466,7 +466,7 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_vfwex.c \ libmpdemux/demux_avs.c \ loader/afl.c \ - loader/driver.c \ + loader/drv.c \ loader/vfl.c \ loader/dshow/DS_AudioDecoder.c \ loader/dshow/DS_Filter.c \ @@ -777,7 +777,7 @@ loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer -vidix/%: CFLAGS += $(SVGALIB_CFLAGS) +vidix/%: CFLAGS += $(CFLAG_DHAHELPER) $(CFLAG_SVGALIB_HELPER) VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ vidix/pci_names.h vidix/pci_vendors.h @@ -998,6 +998,7 @@ install-dhahelper: vidix/dhahelper/dhahelper.o -mkdir -p $(MODULES_DIR) install -m 644 $< $(MODULES_DIR) depmod -a + -mknod /dev/dhahelper c 180 0 dhahelperclean: rm -f vidix/dhahelper/*.o vidix/dhahelper/*~ vidix/dhahelper/test |