Mercurial > mplayer.hg
comparison configure @ 27404:778fac8c186f
Add separate variables for CFLAGS that are specific to internal libraries
and only add them to CFLAGS when compiling objects from those libraries.
author | diego |
---|---|
date | Thu, 07 Aug 2008 21:46:06 +0000 |
parents | e44346d95663 |
children | 48439e36cab0 |
comparison
equal
deleted
inserted
replaced
27403:e44346d95663 | 27404:778fac8c186f |
---|---|
5492 _def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' | 5492 _def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' |
5493 elif darwin ; then | 5493 elif darwin ; then |
5494 _def_dvd_darwin='#define DARWIN_DVD_IOCTL' | 5494 _def_dvd_darwin='#define DARWIN_DVD_IOCTL' |
5495 _ld_extra="$_ld_extra -framework IOKit" | 5495 _ld_extra="$_ld_extra -framework IOKit" |
5496 elif cygwin ; then | 5496 elif cygwin ; then |
5497 CFLAGS="$CFLAGS -DSYS_CYGWIN" | 5497 cflags_libdvdcss="-DSYS_CYGWIN" |
5498 elif beos ; then | 5498 elif beos ; then |
5499 CFLAGS="$CFLAGS -DSYS_BEOS" | 5499 cflags_libdvdcss="-DSYS_BEOS" |
5500 elif os2 ; then | 5500 elif os2 ; then |
5501 CFLAGS="$CFLAGS -DSYS_OS2" | 5501 cflags_libdvdcss="-DSYS_OS2" |
5502 fi | 5502 fi |
5503 cflags_libdvdcss_dvdread="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" | 5503 cflags_libdvdcss_dvdread="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" |
5504 _inputmodules="libdvdcss(internal) $_inputmodules" | 5504 _inputmodules="libdvdcss(internal) $_inputmodules" |
5505 _largefiles=yes | 5505 _largefiles=yes |
5506 else | 5506 else |
5923 _def_vorbis='#define CONFIG_OGGVORBIS 1' | 5923 _def_vorbis='#define CONFIG_OGGVORBIS 1' |
5924 _def_tremor='#define CONFIG_TREMOR 1' | 5924 _def_tremor='#define CONFIG_TREMOR 1' |
5925 _codecmodules="tremor(internal) $_codecmodules" | 5925 _codecmodules="tremor(internal) $_codecmodules" |
5926 _res_comment="internal Tremor" | 5926 _res_comment="internal Tremor" |
5927 if test "$_tremor_low" = yes ; then | 5927 if test "$_tremor_low" = yes ; then |
5928 CFLAGS="$CFLAGS -D_LOW_ACCURACY_" | 5928 cflags_tremor_low="-D_LOW_ACCURACY_" |
5929 _res_comment="internal low accuracy Tremor" | 5929 _res_comment="internal low accuracy Tremor" |
5930 fi | 5930 fi |
5931 elif test "$_tremor_external" = yes ; then | 5931 elif test "$_tremor_external" = yes ; then |
5932 _vorbis=yes | 5932 _vorbis=yes |
5933 _def_vorbis='#define CONFIG_OGGVORBIS 1' | 5933 _def_vorbis='#define CONFIG_OGGVORBIS 1' |
6179 _faad=yes | 6179 _faad=yes |
6180 _res_comment="internal floating-point" | 6180 _res_comment="internal floating-point" |
6181 if test "$_faad_fixed" = yes ; then | 6181 if test "$_faad_fixed" = yes ; then |
6182 # The FIXED_POINT implementation of FAAD2 improves performance | 6182 # The FIXED_POINT implementation of FAAD2 improves performance |
6183 # on some platforms, especially for SBR files. | 6183 # on some platforms, especially for SBR files. |
6184 CFLAGS="$CFLAGS -DFIXED_POINT" | 6184 cflags_faad_fixed="-DFIXED_POINT" |
6185 _res_comment="internal fixed-point" | 6185 _res_comment="internal fixed-point" |
6186 fi | 6186 fi |
6187 elif test "$_faad_external" = yes ; then | 6187 elif test "$_faad_external" = yes ; then |
6188 _faad=yes | 6188 _faad=yes |
6189 _ld_extra="$_ld_extra -lfaad" | 6189 _ld_extra="$_ld_extra -lfaad" |
7756 EXTRAXX_INC = $_inc_extra $_inc_extraxx | 7756 EXTRAXX_INC = $_inc_extra $_inc_extraxx |
7757 CFLAGS = $CFLAGS \$(EXTRA_INC) | 7757 CFLAGS = $CFLAGS \$(EXTRA_INC) |
7758 OPTFLAGS = $CFLAGS \$(EXTRA_INC) | 7758 OPTFLAGS = $CFLAGS \$(EXTRA_INC) |
7759 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) | 7759 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) |
7760 CFLAGS_DHAHELPER = $cflags_dhahelper | 7760 CFLAGS_DHAHELPER = $cflags_dhahelper |
7761 CFLAGS_FAAD_FIXED = $cflags_faad_fixed | |
7762 CFLAGS_LIBDVDCSS = $cflags_libdvdcss | |
7761 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread | 7763 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread |
7762 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer | 7764 CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer |
7763 CFLAGS_STACKREALIGN = $cflags_stackrealign | 7765 CFLAGS_STACKREALIGN = $cflags_stackrealign |
7764 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper | 7766 CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper |
7767 CFLAGS_TREMOR_LOW = $cflags_tremor_low | |
7765 | 7768 |
7766 EXTRALIBS = $_extra_libs | 7769 EXTRALIBS = $_extra_libs |
7767 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm | 7770 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm |
7768 EXTRALIBS_MPLAYER = $_libs_mplayer | 7771 EXTRALIBS_MPLAYER = $_libs_mplayer |
7769 EXTRALIBS_MENCODER = $_libs_mencoder | 7772 EXTRALIBS_MENCODER = $_libs_mencoder |