summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 17:11:04 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 17:11:04 +0300
commit95fba94860a02be5b50c4050f9ba2ac41daea3c2 (patch)
tree79ebb3fb8b351e8347c092e62331cd50b2a06a7b /configure
parent3c2d6d9a8e28900300d20830c309eea2d511cfc8 (diff)
parent0426d5d72df81217f32147d039f3eb29c009af12 (diff)
downloadmpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.bz2
mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.xz
Merge svn changes up to r30917
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure90
1 files changed, 50 insertions, 40 deletions
diff --git a/configure b/configure
index facff63e75..0d150d1581 100755
--- a/configure
+++ b/configure
@@ -1670,12 +1670,13 @@ fi
def_fast_64bit='#define HAVE_FAST_64BIT 0'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 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 GENERIC'
+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'
case "$host_arch" in
i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
- _arch='X86 X86_32'
- _target_arch="ARCH_X86 = yes"
- _target_subarch="ARCH_X86_32 = yes"
+ arch='X86 X86_32'
+ libavcodec_arch="x86"
+ target_arch="ARCH_X86 = yes"
+ target_subarch="ARCH_X86_32 = yes"
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
iproc=486
proc=i486
@@ -1912,16 +1913,17 @@ EOF
;;
ia64)
- _arch='IA64'
- _target_arch='ARCH_IA64 = yes'
+ arch='IA64'
+ target_arch='ARCH_IA64 = yes'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
iproc='ia64'
;;
x86_64|amd64)
- _arch='X86 X86_64'
- _target_subarch='ARCH_X86_64 = yes'
- _target_arch="ARCH_X86 = yes"
+ arch='X86 X86_64'
+ libavcodec_arch="x86"
+ 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'
@@ -2014,8 +2016,9 @@ EOF
;;
sparc|sparc64)
- _arch='SPARC'
- _target_arch='ARCH_SPARC = yes'
+ arch='SPARC'
+ libavcodec_arch="sparc"
+ target_arch='ARCH_SPARC = yes'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
_vis='yes'
@@ -2042,35 +2045,39 @@ EOF
;;
arm*)
- _arch='ARM'
- _target_arch='ARCH_ARM = yes'
+ arch='ARM'
+ libavcodec_arch="arm"
+ target_arch='ARCH_ARM = yes'
iproc='arm'
;;
avr32)
- _arch='AVR32'
- _target_arch='ARCH_AVR32 = yes'
+ arch='AVR32'
+ libavcodec_arch="avr32"
+ target_arch='ARCH_AVR32 = yes'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
iproc='avr32'
test $_fast_clz = "auto" && _fast_clz=yes
;;
sh|sh4)
- _arch='SH4'
- _target_arch='ARCH_SH4 = yes'
+ 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'
- _target_arch='ARCH_PPC = yes'
+ libavcodec_arch="ppc"
+ target_arch='ARCH_PPC = yes'
def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
iproc='ppc'
if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then
- _arch='PPC PPC64'
- _target_subarch='ARCH_PPC64 = yes'
+ arch='PPC PPC64'
+ target_subarch='ARCH_PPC64 = yes'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
fi
echocheck "CPU type"
@@ -2178,8 +2185,9 @@ EOF
;;
alpha*)
- _arch='ALPHA'
- _target_arch='ARCH_ALPHA = yes'
+ arch='ALPHA'
+ libavcodec_arch="alpha"
+ target_arch='ARCH_ALPHA = yes'
iproc='alpha'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
@@ -2222,8 +2230,9 @@ EOF
;;
mips)
- _arch='SGI_MIPS'
- _target_arch='ARCH_SGI_MIPS = yes'
+ arch='SGI_MIPS'
+ libavcodec_arch="mips"
+ target_arch='ARCH_SGI_MIPS = yes'
iproc='sgi-mips'
if irix ; then
@@ -2249,38 +2258,38 @@ EOF
;;
hppa)
- _arch='PA_RISC'
- _target_arch='ARCH_PA_RISC = yes'
+ arch='PA_RISC'
+ target_arch='ARCH_PA_RISC = yes'
iproc='PA-RISC'
;;
s390)
- _arch='S390'
- _target_arch='ARCH_S390 = yes'
+ arch='S390'
+ target_arch='ARCH_S390 = yes'
iproc='390'
;;
s390x)
- _arch='S390X'
- _target_arch='ARCH_S390X = yes'
+ arch='S390X'
+ target_arch='ARCH_S390X = yes'
iproc='390x'
;;
vax)
- _arch='VAX'
- _target_arch='ARCH_VAX = yes'
+ arch='VAX'
+ target_arch='ARCH_VAX = yes'
iproc='vax'
;;
xtensa)
- _arch='XTENSA'
- _target_arch='ARCH_XTENSA = yes'
+ arch='XTENSA'
+ target_arch='ARCH_XTENSA = yes'
iproc='xtensa'
;;
generic)
- _arch='GENERIC'
- _target_arch='ARCH_GENERIC = yes'
+ arch='GENERIC'
+ target_arch='ARCH_GENERIC = yes'
;;
*)
@@ -7864,8 +7873,9 @@ TIMER = $_timer
EXESUF = $_exesuf
EXESUFS_ALL = .exe
-$_target_arch
-$_target_subarch
+$target_arch
+ARCH = $libavcodec_arch
+$target_subarch
$(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/')
MENCODER = $_mencoder
@@ -8229,7 +8239,7 @@ $def_pthread_cache
#define __CPU__ $iproc
$def_words_endian
$def_bigendian
-$(ff_config_enable "$_arch_all" "$_arch" "ARCH")
+$(ff_config_enable "$arch_all" "$arch" "ARCH")
$(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE")