diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
| commit | bec3b84f5ef798ab843028dd62018571a50330ed (patch) | |
| tree | a1805e73289111518e6343d255da1085736cb7f1 /configure | |
| parent | 9d27862072a233b423d4a81e966b1ba9627724a6 (diff) | |
| parent | 19c9e0aceb9620c862cab91b509df91931821d66 (diff) | |
| download | mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2 mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz | |
Merge svn changes up to r26624
Conflicts:
Makefile
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5490,6 +5490,7 @@ if test "$_libdvdcss_internal" = yes ; then _def_dvd_darwin='#define DARWIN_DVD_IOCTL' _ld_extra="$_ld_extra -framework IOKit" fi + _libdvdcss_dvdread_flags="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" _inputmodules="libdvdcss(internal) $_inputmodules" _largefiles=yes else @@ -7789,6 +7790,7 @@ VCD = $_vcd DVDREAD = $_dvdread DVDREAD_INTERNAL = $_dvdread_internal LIBDVDCSS_INTERNAL = $_libdvdcss_internal +LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags DVDNAV = $_dvdnav WIN32DLL = $_win32dll WIN32_EMULATION = $_win32_emulation |