Mercurial > mplayer.hg
changeset 26587:eb5b003d247a
Set libdvdcss CFLAGS for dvdread from configure.
| author | diego |
|---|---|
| date | Wed, 30 Apr 2008 15:36:17 +0000 |
| parents | 4f76dfed8209 |
| children | 836862767447 |
| files | Makefile configure |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Apr 30 14:42:16 2008 +0000 +++ b/Makefile Wed Apr 30 15:36:17 2008 +0000 @@ -771,10 +771,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -ifeq ($(LIBDVDCSS_INTERNAL),yes) -dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H -endif +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
--- a/configure Wed Apr 30 14:42:16 2008 +0000 +++ b/configure Wed Apr 30 15:36:17 2008 +0000 @@ -5490,6 +5490,7 @@ _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 @@ -7788,6 +7789,7 @@ DVDREAD = $_dvdread DVDREAD_INTERNAL = $_dvdread_internal LIBDVDCSS_INTERNAL = $_libdvdcss_internal +LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags DVDNAV = $_dvdnav WIN32DLL = $_win32dll WIN32_EMULATION = $_win32_emulation