mirror of
https://github.com/mpv-player/mpv
synced 2025-01-15 11:31:02 +00:00
Only add -Ilibdvdnav to the CFLAGS of the files that require it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2f2b271649
commit
1005952a8b
1
Makefile
1
Makefile
@ -857,6 +857,7 @@ $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h
|
||||
|
||||
libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
|
||||
libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
|
||||
libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV)
|
||||
libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
|
||||
libfaad2/%: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
|
||||
|
||||
|
3
configure
vendored
3
configure
vendored
@ -7996,7 +7996,7 @@ if test "$_dvdnav" = yes ; then
|
||||
_largefiles=yes
|
||||
def_dvdnav='#define CONFIG_DVDNAV 1'
|
||||
if test "$dvdnav_internal" = yes ; then
|
||||
_inc_extra="$_inc_extra -Ilibdvdnav"
|
||||
cflags_libdvdnav="-Ilibdvdnav"
|
||||
_inputmodules="dvdnav(internal) $_inputmodules"
|
||||
else
|
||||
_inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
|
||||
@ -8054,6 +8054,7 @@ CFLAGS_DHAHELPER = $cflags_dhahelper
|
||||
CFLAGS_FAAD_FIXED = $cflags_faad_fixed
|
||||
CFLAGS_LIBDVDCSS = $cflags_libdvdcss
|
||||
CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
|
||||
CFLAGS_LIBDVDNAV = $cflags_libdvdnav
|
||||
CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer
|
||||
CFLAGS_STACKREALIGN = $cflags_stackrealign
|
||||
CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
|
||||
|
Loading…
Reference in New Issue
Block a user