From f3928b94642cc46805513cf76c9e3f4c3a1102a7 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 13:20:06 +0000 Subject: Split subarch handling off from generic arch handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30919 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 2b606861e0..67545f2df2 100755 --- a/configure +++ b/configure @@ -1765,10 +1765,12 @@ def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' -arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' +arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' +subarch_all='X86_32 X86_64 PPC64' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) - arch='X86 X86_32' + arch='X86' + subarch='X86_32' libavcodec_arch="x86" target_arch="ARCH_X86 = yes" target_subarch="ARCH_X86_32 = yes" @@ -2017,7 +2019,8 @@ EOF ;; x86_64|amd64) - arch='X86 X86_64' + arch='X86' + subarch='X86_64' libavcodec_arch="x86" target_subarch='ARCH_X86_64 = yes' target_arch="ARCH_X86 = yes" @@ -2175,7 +2178,7 @@ EOF iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then - arch='PPC PPC64' + subarch='PPC64' target_subarch='ARCH_PPC64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' fi @@ -8918,6 +8921,7 @@ $def_pthread_cache $def_words_endian $def_bigendian $(ff_config_enable "$arch_all" "$arch" "ARCH") +$(ff_config_enable "$subarch_all" "$subarch" "ARCH") $(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE") -- cgit v1.2.3 From dc440b47d36169ad9e89a360922eca211be23ec3 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 13:34:33 +0000 Subject: Make ff_config_enable work with lowercase values. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30920 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 67545f2df2..93576601fc 100755 --- a/configure +++ b/configure @@ -8766,10 +8766,12 @@ EOF ############################################################################# ff_config_enable () { +list=$(echo $1 | tr '[a-z]' '[A-Z]') +item=$(echo $2 | tr '[a-z]' '[A-Z]') _nprefix=$3; test -z "$_nprefix" && _nprefix='CONFIG' -for part in $1; do - if $(echo $2 | grep -q -E "(^| )$part($| )"); then +for part in $list; do + if $(echo $item | grep -q -E "(^| )$part($| )"); then echo "#define ${_nprefix}_$part 1" else echo "#define ${_nprefix}_$part 0" -- cgit v1.2.3 From 0be7b19c27b9171956f3b81d1c8cfa5369d1154c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 13:37:36 +0000 Subject: cosmetics: Drop leading underscore from cpuexts variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30921 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 93576601fc..bb02b1555e 100755 --- a/configure +++ b/configure @@ -2845,27 +2845,27 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP NEON IWMMXT MMI VIS MVI' -test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" -test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" -test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" -test "$_3dnow" = yes && _cpuexts="AMD3DNOW $_cpuexts" -test "$_3dnowext" = yes && _cpuexts="AMD3DNOWEXT $_cpuexts" -test "$_sse" = yes && _cpuexts="SSE $_cpuexts" -test "$_sse2" = yes && _cpuexts="SSE2 $_cpuexts" -test "$_ssse3" = yes && _cpuexts="SSSE3 $_cpuexts" -test "$_cmov" = yes && _cpuexts="CMOV $_cpuexts" -test "$_fast_cmov" = yes && _cpuexts="FAST_CMOV $_cpuexts" -test "$_fast_clz" = yes && _cpuexts="FAST_CLZ $_cpuexts" -test "$pld" = yes && _cpuexts="PLD $_cpuexts" -test "$_armv5te" = yes && _cpuexts="ARMV5TE $_cpuexts" -test "$_armv6" = yes && _cpuexts="ARMV6 $_cpuexts" -test "$_armv6t2" = yes && _cpuexts="ARMV6T2 $_cpuexts" -test "$_armvfp" = yes && _cpuexts="ARMVFP $_cpuexts" -test "$neon" = yes && _cpuexts="NEON $_cpuexts" -test "$_iwmmxt" = yes && _cpuexts="IWMMXT $_cpuexts" -test "$_vis" = yes && _cpuexts="VIS $_cpuexts" -test "$_mvi" = yes && _cpuexts="MVI $_cpuexts" +cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV FAST_CLZ PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP NEON IWMMXT MMI VIS MVI' +test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" +test "$_mmx" = yes && cpuexts="MMX $cpuexts" +test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" +test "$_3dnow" = yes && cpuexts="AMD3DNOW $cpuexts" +test "$_3dnowext" = yes && cpuexts="AMD3DNOWEXT $cpuexts" +test "$_sse" = yes && cpuexts="SSE $cpuexts" +test "$_sse2" = yes && cpuexts="SSE2 $cpuexts" +test "$_ssse3" = yes && cpuexts="SSSE3 $cpuexts" +test "$_cmov" = yes && cpuexts="CMOV $cpuexts" +test "$_fast_cmov" = yes && cpuexts="FAST_CMOV $cpuexts" +test "$_fast_clz" = yes && cpuexts="FAST_CLZ $cpuexts" +test "$pld" = yes && cpuexts="PLD $cpuexts" +test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts" +test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts" +test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" +test "$_armvfp" = yes && cpuexts="ARMVFP $cpuexts" +test "$neon" = yes && cpuexts="NEON $cpuexts" +test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts" +test "$_vis" = yes && cpuexts="VIS $cpuexts" +test "$_mvi" = yes && cpuexts="MVI $cpuexts" # Checking kernel version... if x86_32 && linux ; then @@ -8503,7 +8503,7 @@ EXESUFS_ALL = .exe $target_arch ARCH = $libavcodec_arch $target_subarch -$(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') +$(echo $cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') MENCODER = $_mencoder MPLAYER = $_mplayer @@ -8924,7 +8924,7 @@ $def_words_endian $def_bigendian $(ff_config_enable "$arch_all" "$arch" "ARCH") $(ff_config_enable "$subarch_all" "$subarch" "ARCH") -$(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE") +$(ff_config_enable "$cpuexts_all" "$cpuexts" "HAVE") /* DVD/VCD/CD */ -- cgit v1.2.3 From c52aed20ee4bb3fc05fbec39dc3daf8959dcdc3c Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 13:41:54 +0000 Subject: Lowercase arch and subarch values. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30922 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'configure') diff --git a/configure b/configure index bb02b1555e..2178e78449 100755 --- a/configure +++ b/configure @@ -1769,8 +1769,8 @@ arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS SGI_MIPS PA_RISC S390 S390 subarch_all='X86_32 X86_64 PPC64' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) - arch='X86' - subarch='X86_32' + arch='x86' + subarch='x86_32' libavcodec_arch="x86" target_arch="ARCH_X86 = yes" target_subarch="ARCH_X86_32 = yes" @@ -2012,15 +2012,15 @@ EOF ;; ia64) - arch='IA64' + arch='ia64' target_arch='ARCH_IA64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='ia64' ;; x86_64|amd64) - arch='X86' - subarch='X86_64' + arch='x86' + subarch='x86_64' libavcodec_arch="x86" target_subarch='ARCH_X86_64 = yes' target_arch="ARCH_X86 = yes" @@ -2116,7 +2116,7 @@ EOF ;; sparc|sparc64) - arch='SPARC' + arch='sparc' libavcodec_arch="sparc" target_arch='ARCH_SPARC = yes' iproc='sparc' @@ -2145,14 +2145,14 @@ EOF ;; arm*) - arch='ARM' + arch='arm' libavcodec_arch="arm" target_arch='ARCH_ARM = yes' iproc='arm' ;; avr32) - arch='AVR32' + arch='avr32' libavcodec_arch="avr32" target_arch='ARCH_AVR32 = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' @@ -2161,14 +2161,14 @@ EOF ;; sh|sh4) - arch='SH4' + arch='sh4' libavcodec_arch="sh4" target_arch='ARCH_SH4 = yes' iproc='sh4' ;; ppc|ppc64|powerpc|powerpc64) - arch='PPC' + arch='ppc' def_dcbzl='#define HAVE_DCBZL 0' libavcodec_arch="ppc" target_arch='ARCH_PPC = yes' @@ -2178,7 +2178,7 @@ EOF iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then - subarch='PPC64' + subarch='ppc64' target_subarch='ARCH_PPC64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' fi @@ -2287,7 +2287,7 @@ EOF ;; alpha*) - arch='ALPHA' + arch='alpha' libavcodec_arch="alpha" target_arch='ARCH_ALPHA = yes' iproc='alpha' @@ -2331,7 +2331,7 @@ EOF ;; mips) - arch='SGI_MIPS' + arch='sgi_mips' libavcodec_arch="mips" target_arch='ARCH_SGI_MIPS = yes' iproc='sgi-mips' @@ -2359,37 +2359,37 @@ EOF ;; hppa) - arch='PA_RISC' + arch='pa_risc' target_arch='ARCH_PA_RISC = yes' iproc='PA-RISC' ;; s390) - arch='S390' + arch='s390' target_arch='ARCH_S390 = yes' iproc='390' ;; s390x) - arch='S390X' + arch='s390x' target_arch='ARCH_S390X = yes' iproc='390x' ;; vax) - arch='VAX' + arch='vax' target_arch='ARCH_VAX = yes' iproc='vax' ;; xtensa) - arch='XTENSA' + arch='xtensa' target_arch='ARCH_XTENSA = yes' iproc='xtensa' ;; generic) - arch='GENERIC' + arch='generic' target_arch='ARCH_GENERIC = yes' ;; -- cgit v1.2.3 From 82b8a649aee9a1ea35236cdeb44074d434716ced Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 13:55:59 +0000 Subject: Drop libavcodec_arch hack; ARCH can now be set directly in config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30923 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 2178e78449..4e44602933 100755 --- a/configure +++ b/configure @@ -1771,7 +1771,6 @@ case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) arch='x86' subarch='x86_32' - libavcodec_arch="x86" target_arch="ARCH_X86 = yes" target_subarch="ARCH_X86_32 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' @@ -2021,7 +2020,6 @@ EOF x86_64|amd64) arch='x86' subarch='x86_64' - libavcodec_arch="x86" target_subarch='ARCH_X86_64 = yes' target_arch="ARCH_X86 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' @@ -2117,7 +2115,6 @@ EOF sparc|sparc64) arch='sparc' - libavcodec_arch="sparc" target_arch='ARCH_SPARC = yes' iproc='sparc' if test "$host_arch" = "sparc64" ; then @@ -2146,14 +2143,12 @@ EOF arm*) arch='arm' - libavcodec_arch="arm" target_arch='ARCH_ARM = yes' iproc='arm' ;; avr32) arch='avr32' - libavcodec_arch="avr32" target_arch='ARCH_AVR32 = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='avr32' @@ -2162,7 +2157,6 @@ EOF sh|sh4) arch='sh4' - libavcodec_arch="sh4" target_arch='ARCH_SH4 = yes' iproc='sh4' ;; @@ -2170,7 +2164,6 @@ EOF ppc|ppc64|powerpc|powerpc64) arch='ppc' def_dcbzl='#define HAVE_DCBZL 0' - libavcodec_arch="ppc" target_arch='ARCH_PPC = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' @@ -2288,7 +2281,6 @@ EOF alpha*) arch='alpha' - libavcodec_arch="alpha" target_arch='ARCH_ALPHA = yes' iproc='alpha' @@ -2332,7 +2324,6 @@ EOF mips) arch='sgi_mips' - libavcodec_arch="mips" target_arch='ARCH_SGI_MIPS = yes' iproc='sgi-mips' @@ -8500,8 +8491,8 @@ TIMER = $_timer EXESUF = $_exesuf EXESUFS_ALL = .exe +ARCH = $arch $target_arch -ARCH = $libavcodec_arch $target_subarch $(echo $cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') -- cgit v1.2.3 From d32a13a467e319ce7503f1cbeeeb27b09483556b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 14:09:09 +0000 Subject: Rename SGI_MIPS architecture to plain MIPS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30924 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 4e44602933..9787014c25 100755 --- a/configure +++ b/configure @@ -1765,7 +1765,7 @@ def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' -arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' +arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' subarch_all='X86_32 X86_64 PPC64' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) @@ -2323,9 +2323,9 @@ EOF ;; mips) - arch='sgi_mips' - target_arch='ARCH_SGI_MIPS = yes' - iproc='sgi-mips' + arch='mips' + target_arch='ARCH_MIPS = yes' + iproc='mips' if irix ; then echocheck "CPU type" -- cgit v1.2.3 From 9e8f301f22dc2743c7f979282771662e67fb1d45 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Mar 2010 14:41:32 +0000 Subject: Introduce mak_enable function to set variables in config.mak. This avoids manually setting target architecture and CPU extensions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30925 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 9787014c25..7ed84bf714 100755 --- a/configure +++ b/configure @@ -1771,8 +1771,6 @@ case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) arch='x86' subarch='x86_32' - target_arch="ARCH_X86 = yes" - target_subarch="ARCH_X86_32 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' @@ -2012,7 +2010,6 @@ EOF ia64) arch='ia64' - target_arch='ARCH_IA64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='ia64' ;; @@ -2020,8 +2017,6 @@ EOF x86_64|amd64) arch='x86' subarch='x86_64' - target_subarch='ARCH_X86_64 = yes' - target_arch="ARCH_X86 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' @@ -2115,7 +2110,6 @@ EOF sparc|sparc64) arch='sparc' - target_arch='ARCH_SPARC = yes' iproc='sparc' if test "$host_arch" = "sparc64" ; then _vis='yes' @@ -2143,13 +2137,11 @@ EOF arm*) arch='arm' - target_arch='ARCH_ARM = yes' iproc='arm' ;; avr32) arch='avr32' - target_arch='ARCH_AVR32 = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='avr32' test $_fast_clz = "auto" && _fast_clz=yes @@ -2157,14 +2149,12 @@ EOF sh|sh4) arch='sh4' - target_arch='ARCH_SH4 = yes' iproc='sh4' ;; ppc|ppc64|powerpc|powerpc64) arch='ppc' def_dcbzl='#define HAVE_DCBZL 0' - target_arch='ARCH_PPC = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' @@ -2172,7 +2162,6 @@ EOF if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then subarch='ppc64' - target_subarch='ARCH_PPC64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' fi echocheck "CPU type" @@ -2281,7 +2270,6 @@ EOF alpha*) arch='alpha' - target_arch='ARCH_ALPHA = yes' iproc='alpha' echocheck "CPU type" @@ -2324,7 +2312,6 @@ EOF mips) arch='mips' - target_arch='ARCH_MIPS = yes' iproc='mips' if irix ; then @@ -2351,37 +2338,31 @@ EOF hppa) arch='pa_risc' - target_arch='ARCH_PA_RISC = yes' iproc='PA-RISC' ;; s390) arch='s390' - target_arch='ARCH_S390 = yes' iproc='390' ;; s390x) arch='s390x' - target_arch='ARCH_S390X = yes' iproc='390x' ;; vax) arch='vax' - target_arch='ARCH_VAX = yes' iproc='vax' ;; xtensa) arch='xtensa' - target_arch='ARCH_XTENSA = yes' iproc='xtensa' ;; generic) arch='generic' - target_arch='ARCH_GENERIC = yes' ;; *) @@ -8426,6 +8407,17 @@ echores "$_dvdnav" # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). # Read dvdnav comment above. +mak_enable () { +list=$(echo $1 | tr '[a-z]' '[A-Z]') +item=$(echo $2 | tr '[a-z]' '[A-Z]') +nprefix=$3; +for part in $list; do + if $(echo $item | grep -q -E "(^| )$part($| )"); then + echo "${nprefix}_$part = yes" + fi +done +} + ############################################################################# echo "Creating config.mak" cat > config.mak << EOF @@ -8492,9 +8484,9 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe ARCH = $arch -$target_arch -$target_subarch -$(echo $cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') +$(mak_enable "$arch_all" "$arch" ARCH) +$(mak_enable "$subarch_all" "$subarch" ARCH) +$(mak_enable "$cpuexts_all" "$cpuexts" HAVE) MENCODER = $_mencoder MPLAYER = $_mplayer -- cgit v1.2.3 From 9d38fc06785322fce3de721e1d59f1792b0b8eaa Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 25 Mar 2010 18:51:57 +0000 Subject: Move some FFmpeg-specific entries to the FFmpeg section of config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30958 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 7ed84bf714..de488ea84d 100755 --- a/configure +++ b/configure @@ -8446,10 +8446,8 @@ AS = $_cc CC = $_cc CXX = $_cc HOST_CC = $_host_cc -YASM = $_yasm INSTALL = $_install INSTALLSTRIP = $_install_strip -RANLIB = $_ranlib WINDRES = $_windres CFLAGS = $CFLAGS $extra_cflags @@ -8465,7 +8463,6 @@ 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 -YASMFLAGS = $YASMFLAGS EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs EXTRALIBS_MPLAYER = $libs_mplayer @@ -8535,8 +8532,6 @@ FAAC=$_faac FAAD = $_faad FAAD_INTERNAL = $_faad_internal FASTMEMCPY = $_fastmemcpy -$mak_hardcoded_tables -$mak_libavcodec_mpegaudio_hp FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp @@ -8685,6 +8680,10 @@ HOSTCFLAGS=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 HOSTLIBS=-lm CC_O=-o \$@ LD=gcc +RANLIB = $_ranlib +YASM = $_yasm +YASMFLAGS = $YASMFLAGS + CONFIG_STATIC=yes SRC_PATH=.. BUILD_ROOT=.. @@ -8705,6 +8704,9 @@ CONFIG_LSP=yes CONFIG_MDCT=yes CONFIG_RDFT=yes +$mak_hardcoded_tables +$mak_libavcodec_mpegaudio_hp + CONFIG_BZLIB=$bzlib CONFIG_ENCODERS=yes CONFIG_GPL=yes -- cgit v1.2.3 From a36308f42d1829b40aad183b61313573f17632ef Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 25 Mar 2010 18:53:37 +0000 Subject: Remove unused MACOSX_BUNDLE config.mak entry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30959 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index de488ea84d..cbb2d6fd1a 100755 --- a/configure +++ b/configure @@ -8572,7 +8572,6 @@ LIBSMBCLIENT = $_smb LIBTHEORA = $_theora LIRC = $_lirc LIVE555 = $_live -MACOSX_BUNDLE = $_macosx_bundle MACOSX_FINDER = $_macosx_finder MD5SUM = $_md5sum MGA = $_mga -- cgit v1.2.3 From f72822d9e6ab88a26c04664871d883c836b3eb5f Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 25 Mar 2010 19:53:05 +0000 Subject: Remove unused OPTFLAGS variable from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30960 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index cbb2d6fd1a..eb576e472d 100755 --- a/configure +++ b/configure @@ -8452,7 +8452,6 @@ WINDRES = $_windres CFLAGS = $CFLAGS $extra_cflags ASFLAGS = $CFLAGS $extra_cflags -OPTFLAGS = $CFLAGS $extra_cflags CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags CFLAGS_DHAHELPER = $cflags_dhahelper CFLAGS_FAAD_FIXED = $cflags_faad_fixed -- cgit v1.2.3