Mercurial > mplayer.hg
comparison configure @ 28794:ee67a72f9dde
Only add -Ilibdvdnav to the CFLAGS of the files that require it.
author | diego |
---|---|
date | Thu, 05 Mar 2009 22:19:47 +0000 |
parents | 1f76d86e49ae |
children | 88ac68461aae |
comparison
equal
deleted
inserted
replaced
28793:afbd8dd23299 | 28794:ee67a72f9dde |
---|---|
7994 fi | 7994 fi |
7995 if test "$_dvdnav" = yes ; then | 7995 if test "$_dvdnav" = yes ; then |
7996 _largefiles=yes | 7996 _largefiles=yes |
7997 def_dvdnav='#define CONFIG_DVDNAV 1' | 7997 def_dvdnav='#define CONFIG_DVDNAV 1' |
7998 if test "$dvdnav_internal" = yes ; then | 7998 if test "$dvdnav_internal" = yes ; then |
7999 _inc_extra="$_inc_extra -Ilibdvdnav" | 7999 cflags_libdvdnav="-Ilibdvdnav" |
8000 _inputmodules="dvdnav(internal) $_inputmodules" | 8000 _inputmodules="dvdnav(internal) $_inputmodules" |
8001 else | 8001 else |
8002 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" | 8002 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" |
8003 _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" | 8003 _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" |
8004 _inputmodules="dvdnav $_inputmodules" | 8004 _inputmodules="dvdnav $_inputmodules" |
8052 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) | 8052 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) |
8053 CFLAGS_DHAHELPER = $cflags_dhahelper | 8053 CFLAGS_DHAHELPER = $cflags_dhahelper |
8054 CFLAGS_FAAD_FIXED = $cflags_faad_fixed | 8054 CFLAGS_FAAD_FIXED = $cflags_faad_fixed |
8055 CFLAGS_LIBDVDCSS = $cflags_libdvdcss | 8055 CFLAGS_LIBDVDCSS = $cflags_libdvdcss |
8056 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread | 8056 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread |
8057 CFLAGS_LIBDVDNAV = $cflags_libdvdnav | |
8057 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer | 8058 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer |
8058 CFLAGS_STACKREALIGN = $cflags_stackrealign | 8059 CFLAGS_STACKREALIGN = $cflags_stackrealign |
8059 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper | 8060 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper |
8060 CFLAGS_TREMOR_LOW = $cflags_tremor_low | 8061 CFLAGS_TREMOR_LOW = $cflags_tremor_low |
8061 YASMFLAGS = $YASMFLAGS | 8062 YASMFLAGS = $YASMFLAGS |