Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: source/libvpx/build/make/configure.sh

Issue 12077018: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/build/make/ads2gas_apple.pl ('k') | source/libvpx/configure » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 ## 2 ##
3 ## configure.sh 3 ## configure.sh
4 ## 4 ##
5 ## This script is sourced by the main configure script and contains 5 ## This script is sourced by the main configure script and contains
6 ## utility functions and other common bits that aren't strictly libvpx 6 ## utility functions and other common bits that aren't strictly libvpx
7 ## related. 7 ## related.
8 ## 8 ##
9 ## This build system is based in part on the FFmpeg configure script. 9 ## This build system is based in part on the FFmpeg configure script.
10 ## 10 ##
(...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 #ifndef __ILP32__ 1004 #ifndef __ILP32__
1005 #error "not x32" 1005 #error "not x32"
1006 #endif 1006 #endif
1007 EOF 1007 EOF
1008 soft_enable runtime_cpu_detect 1008 soft_enable runtime_cpu_detect
1009 soft_enable mmx 1009 soft_enable mmx
1010 soft_enable sse 1010 soft_enable sse
1011 soft_enable sse2 1011 soft_enable sse2
1012 soft_enable sse3 1012 soft_enable sse3
1013 soft_enable ssse3 1013 soft_enable ssse3
1014 if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then
1015 RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
1016 else
1017 soft_enable sse4_1
1018 fi
1019 1014
1020 case ${tgt_os} in 1015 case ${tgt_os} in
1021 win*) 1016 win*)
1022 enabled gcc && add_cflags -fno-common 1017 enabled gcc && add_cflags -fno-common
1023 ;; 1018 ;;
1024 solaris*) 1019 solaris*)
1025 CC=${CC:-${CROSS}gcc} 1020 CC=${CC:-${CROSS}gcc}
1026 CXX=${CXX:-${CROSS}g++} 1021 CXX=${CXX:-${CROSS}g++}
1027 LD=${LD:-${CROSS}gcc} 1022 LD=${LD:-${CROSS}gcc}
1028 CROSS=${CROSS:-g} 1023 CROSS=${CROSS:-g}
(...skipping 21 matching lines...) Expand all
1050 *) 1045 *)
1051 tune_cflags="-march=" 1046 tune_cflags="-march="
1052 ;; 1047 ;;
1053 esac 1048 esac
1054 ;; 1049 ;;
1055 gcc*) 1050 gcc*)
1056 add_cflags -m${bits} 1051 add_cflags -m${bits}
1057 add_ldflags -m${bits} 1052 add_ldflags -m${bits}
1058 link_with_cc=gcc 1053 link_with_cc=gcc
1059 tune_cflags="-march=" 1054 tune_cflags="-march="
1060 setup_gnu_toolchain 1055 setup_gnu_toolchain
1061 #for 32 bit x86 builds, -O3 did not turn on this flag 1056 #for 32 bit x86 builds, -O3 did not turn on this flag
1062 enabled optimizations && check_add_cflags -fomit-frame-pointer 1057 enabled optimizations && check_add_cflags -fomit-frame-pointer
1063 ;; 1058 ;;
1064 vs*) 1059 vs*)
1065 # When building with Microsoft Visual Studio the assembler is 1060 # When building with Microsoft Visual Studio the assembler is
1066 # invoked directly. Checking at configure time is unnecessary. 1061 # invoked directly. Checking at configure time is unnecessary.
1067 # Skip the check by setting AS arbitrarily 1062 # Skip the check by setting AS arbitrarily
1068 AS=msvs 1063 AS=msvs
1069 ;; 1064 ;;
1070 esac 1065 esac
1071 1066
1067 # We can't use 'check_cflags' until the compiler is configured and CC is
1068 # populated.
1069 if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4.1; then
1070 RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
1071 else
1072 soft_enable sse4_1
1073 fi
1074
1072 case "${AS}" in 1075 case "${AS}" in
1073 auto|"") 1076 auto|"")
1074 which nasm >/dev/null 2>&1 && AS=nasm 1077 which nasm >/dev/null 2>&1 && AS=nasm
1075 which yasm >/dev/null 2>&1 && AS=yasm 1078 which yasm >/dev/null 2>&1 && AS=yasm
1076 [ "${AS}" = auto -o -z "${AS}" ] \ 1079 [ "${AS}" = auto -o -z "${AS}" ] \
1077 && die "Neither yasm nor nasm have been found" 1080 && die "Neither yasm nor nasm have been found"
1078 ;; 1081 ;;
1079 esac 1082 esac
1080 log_echo " using $AS" 1083 log_echo " using $AS"
1081 [ "${AS##*/}" = nasm ] && add_asflags -Ox 1084 [ "${AS##*/}" = nasm ] && add_asflags -Ox
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 # Prepare the PWD for building. 1282 # Prepare the PWD for building.
1280 for f in ${OOT_INSTALLS}; do 1283 for f in ${OOT_INSTALLS}; do
1281 install -D ${source_path}/$f $f 1284 install -D ${source_path}/$f $f
1282 done 1285 done
1283 fi 1286 fi
1284 cp ${source_path}/build/make/Makefile . 1287 cp ${source_path}/build/make/Makefile .
1285 1288
1286 clean_temp_files 1289 clean_temp_files
1287 true 1290 true
1288 } 1291 }
OLDNEW
« no previous file with comments | « source/libvpx/build/make/ads2gas_apple.pl ('k') | source/libvpx/configure » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698