diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 15:36:17 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-30 15:36:17 +0000 |
commit | 4d3d65af036432f816b004c01e81b0a89ea00651 (patch) | |
tree | 8978d6ef4992187ae5b9cd272c35ad95da3329b2 | |
parent | c3c8df3691252a343069d4f02613e57eca57fe63 (diff) | |
download | mpv-4d3d65af036432f816b004c01e81b0a89ea00651.tar.bz2 mpv-4d3d65af036432f816b004c01e81b0a89ea00651.tar.xz |
Set libdvdcss CFLAGS for dvdread from configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26619 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 5 | ||||
-rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -771,10 +771,7 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o 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 @@ -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 @@ -7788,6 +7789,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 |