Mercurial > mplayer.hg

comparison configure @ 30874:78c91b9f7d3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation after FFmpeg r22569 at least for some architectures.
author cehoyos
date Wed, 17 Mar 2010 10:46:18 +0000
parents b193ab2083ad
children 447a58cf1611
comparison
equal deleted inserted replaced
30873:b193ab2083ad 30874:78c91b9f7d3d
1767 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' 1767 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0'
1768 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' 1768 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'
1769 case "$host_arch" in 1769 case "$host_arch" in
1770 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) 1770 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
1771 arch='X86 X86_32' 1771 arch='X86 X86_32'
1772 libavcodec_arch="x86"
1772 target_arch="ARCH_X86 = yes" 1773 target_arch="ARCH_X86 = yes"
1773 target_subarch="ARCH_X86_32 = yes" 1774 target_subarch="ARCH_X86_32 = yes"
1774 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 1775 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
1775 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 1776 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
1776 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 1777 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2015 iproc='ia64' 2016 iproc='ia64'
2016 ;; 2017 ;;
2017 2018
2018 x86_64|amd64) 2019 x86_64|amd64)
2019 arch='X86 X86_64' 2020 arch='X86 X86_64'
2021 libavcodec_arch="x86"
2020 target_subarch='ARCH_X86_64 = yes' 2022 target_subarch='ARCH_X86_64 = yes'
2021 target_arch="ARCH_X86 = yes" 2023 target_arch="ARCH_X86 = yes"
2022 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2024 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2023 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2025 def_fast_64bit='#define HAVE_FAST_64BIT 1'
2024 iproc='x86_64' 2026 iproc='x86_64'
2110 echores "$proc" 2112 echores "$proc"
2111 ;; 2113 ;;
2112 2114
2113 sparc|sparc64) 2115 sparc|sparc64)
2114 arch='SPARC' 2116 arch='SPARC'
2117 libavcodec_arch="sparc"
2115 target_arch='ARCH_SPARC = yes' 2118 target_arch='ARCH_SPARC = yes'
2116 iproc='sparc' 2119 iproc='sparc'
2117 if test "$host_arch" = "sparc64" ; then 2120 if test "$host_arch" = "sparc64" ; then
2118 _vis='yes' 2121 _vis='yes'
2119 proc='ultrasparc' 2122 proc='ultrasparc'
2138 _optimizing="$proc" 2141 _optimizing="$proc"
2139 ;; 2142 ;;
2140 2143
2141 arm*) 2144 arm*)
2142 arch='ARM' 2145 arch='ARM'
2146 libavcodec_arch="arm"
2143 target_arch='ARCH_ARM = yes' 2147 target_arch='ARCH_ARM = yes'
2144 iproc='arm' 2148 iproc='arm'
2145 ;; 2149 ;;
2146 2150
2147 avr32) 2151 avr32)
2148 arch='AVR32' 2152 arch='AVR32'
2153 libavcodec_arch="avr32"
2149 target_arch='ARCH_AVR32 = yes' 2154 target_arch='ARCH_AVR32 = yes'
2150 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2155 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2151 iproc='avr32' 2156 iproc='avr32'
2152 test $_fast_clz = "auto" && _fast_clz=yes 2157 test $_fast_clz = "auto" && _fast_clz=yes
2153 ;; 2158 ;;
2154 2159
2155 sh|sh4) 2160 sh|sh4)
2156 arch='SH4' 2161 arch='SH4'
2162 libavcodec_arch="sh4"
2157 target_arch='ARCH_SH4 = yes' 2163 target_arch='ARCH_SH4 = yes'
2158 iproc='sh4' 2164 iproc='sh4'
2159 ;; 2165 ;;
2160 2166
2161 ppc|ppc64|powerpc|powerpc64) 2167 ppc|ppc64|powerpc|powerpc64)
2162 arch='PPC' 2168 arch='PPC'
2163 def_dcbzl='#define HAVE_DCBZL 0' 2169 def_dcbzl='#define HAVE_DCBZL 0'
2170 libavcodec_arch="ppc"
2164 target_arch='ARCH_PPC = yes' 2171 target_arch='ARCH_PPC = yes'
2165 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2172 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2166 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 2173 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2167 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 2174 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2168 iproc='ppc' 2175 iproc='ppc'
2276 2283
2277 ;; 2284 ;;
2278 2285
2279 alpha*) 2286 alpha*)
2280 arch='ALPHA' 2287 arch='ALPHA'
2288 libavcodec_arch="alpha"
2281 target_arch='ARCH_ALPHA = yes' 2289 target_arch='ARCH_ALPHA = yes'
2282 iproc='alpha' 2290 iproc='alpha'
2283 2291
2284 echocheck "CPU type" 2292 echocheck "CPU type"
2285 cat > $TMPC << EOF 2293 cat > $TMPC << EOF
2319 _optimizing="$proc" 2327 _optimizing="$proc"
2320 ;; 2328 ;;
2321 2329
2322 mips) 2330 mips)
2323 arch='SGI_MIPS' 2331 arch='SGI_MIPS'
2332 libavcodec_arch="mips"
2324 target_arch='ARCH_SGI_MIPS = yes' 2333 target_arch='ARCH_SGI_MIPS = yes'
2325 iproc='sgi-mips' 2334 iproc='sgi-mips'
2326 2335
2327 if irix ; then 2336 if irix ; then
2328 echocheck "CPU type" 2337 echocheck "CPU type"
8487 8496
8488 EXESUF = $_exesuf 8497 EXESUF = $_exesuf
8489 EXESUFS_ALL = .exe 8498 EXESUFS_ALL = .exe
8490 8499
8491 $target_arch 8500 $target_arch
8501 ARCH = $libavcodec_arch
8492 $target_subarch 8502 $target_subarch
8493 $(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') 8503 $(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/')
8494 8504
8495 MENCODER = $_mencoder 8505 MENCODER = $_mencoder
8496 MPLAYER = $_mplayer 8506 MPLAYER = $_mplayer