From af76be6e197382af491fadef3fcf821a721c99f5 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 21:46:06 +0000 Subject: Add separate variables for CFLAGS that are specific to internal libraries and only add them to CFLAGS when compiling objects from those libraries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index db2910cada..147115878b 100755 --- a/configure +++ b/configure @@ -5494,11 +5494,11 @@ if test "$_libdvdcss_internal" = yes ; then _def_dvd_darwin='#define DARWIN_DVD_IOCTL' _ld_extra="$_ld_extra -framework IOKit" elif cygwin ; then - CFLAGS="$CFLAGS -DSYS_CYGWIN" + cflags_libdvdcss="-DSYS_CYGWIN" elif beos ; then - CFLAGS="$CFLAGS -DSYS_BEOS" + cflags_libdvdcss="-DSYS_BEOS" elif os2 ; then - CFLAGS="$CFLAGS -DSYS_OS2" + cflags_libdvdcss="-DSYS_OS2" fi cflags_libdvdcss_dvdread="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" _inputmodules="libdvdcss(internal) $_inputmodules" @@ -5925,7 +5925,7 @@ if test "$_tremor_internal" = yes ; then _codecmodules="tremor(internal) $_codecmodules" _res_comment="internal Tremor" if test "$_tremor_low" = yes ; then - CFLAGS="$CFLAGS -D_LOW_ACCURACY_" + cflags_tremor_low="-D_LOW_ACCURACY_" _res_comment="internal low accuracy Tremor" fi elif test "$_tremor_external" = yes ; then @@ -6181,7 +6181,7 @@ if test "$_faad_internal" = yes ; then if test "$_faad_fixed" = yes ; then # The FIXED_POINT implementation of FAAD2 improves performance # on some platforms, especially for SBR files. - CFLAGS="$CFLAGS -DFIXED_POINT" + cflags_faad_fixed="-DFIXED_POINT" _res_comment="internal fixed-point" fi elif test "$_faad_external" = yes ; then @@ -7758,10 +7758,13 @@ CFLAGS = $CFLAGS \$(EXTRA_INC) OPTFLAGS = $CFLAGS \$(EXTRA_INC) CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) CFLAGS_DHAHELPER = $cflags_dhahelper +CFLAGS_FAAD_FIXED = $cflags_faad_fixed +CFLAGS_LIBDVDCSS = $cflags_libdvdcss CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer CFLAGS_STACKREALIGN = $cflags_stackrealign CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper +CFLAGS_TREMOR_LOW = $cflags_tremor_low EXTRALIBS = $_extra_libs EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm -- cgit v1.2.3