summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 227eb3e0cc..9d64b3c3e6 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/configure b/configure
index a3bc00fe22..d0dbc375e8 100755
--- a/configure
+++ b/configure
@@ -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