0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00

Set libdvdcss CFLAGS for dvdread from configure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26619 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-30 15:36:17 +00:00
parent c3c8df3691
commit 4d3d65af03
2 changed files with 3 additions and 4 deletions

View File

@ -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 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
$(WINDRES) -o $@ $< $(WINDRES) -o $@ $<
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS)
ifeq ($(LIBDVDCSS_INTERNAL),yes)
dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H
endif
libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE

2
configure vendored
View File

@ -5490,6 +5490,7 @@ if test "$_libdvdcss_internal" = yes ; then
_def_dvd_darwin='#define DARWIN_DVD_IOCTL' _def_dvd_darwin='#define DARWIN_DVD_IOCTL'
_ld_extra="$_ld_extra -framework IOKit" _ld_extra="$_ld_extra -framework IOKit"
fi fi
_libdvdcss_dvdread_flags="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H"
_inputmodules="libdvdcss(internal) $_inputmodules" _inputmodules="libdvdcss(internal) $_inputmodules"
_largefiles=yes _largefiles=yes
else else
@ -7788,6 +7789,7 @@ VCD = $_vcd
DVDREAD = $_dvdread DVDREAD = $_dvdread
DVDREAD_INTERNAL = $_dvdread_internal DVDREAD_INTERNAL = $_dvdread_internal
LIBDVDCSS_INTERNAL = $_libdvdcss_internal LIBDVDCSS_INTERNAL = $_libdvdcss_internal
LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
DVDNAV = $_dvdnav DVDNAV = $_dvdnav
WIN32DLL = $_win32dll WIN32DLL = $_win32dll
WIN32_EMULATION = $_win32_emulation WIN32_EMULATION = $_win32_emulation