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

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

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « source/libvpx/build/make/Makefile ('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/sh 1 #!/bin/sh
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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 CC=${CC} 421 CC=${CC}
422 CXX=${CXX} 422 CXX=${CXX}
423 AR=${AR} 423 AR=${AR}
424 LD=${LD} 424 LD=${LD}
425 AS=${AS} 425 AS=${AS}
426 STRIP=${STRIP} 426 STRIP=${STRIP}
427 NM=${NM} 427 NM=${NM}
428 428
429 CFLAGS = ${CFLAGS} 429 CFLAGS = ${CFLAGS}
430 CXXFLAGS = ${CXXFLAGS} 430 CXXFLAGS = ${CXXFLAGS}
431 ARFLAGS = -rus\$(if \$(quiet),c,v) 431 ARFLAGS = -crs\$(if \$(quiet),,v)
432 LDFLAGS = ${LDFLAGS} 432 LDFLAGS = ${LDFLAGS}
433 ASFLAGS = ${ASFLAGS} 433 ASFLAGS = ${ASFLAGS}
434 extralibs = ${extralibs} 434 extralibs = ${extralibs}
435 AS_SFX = ${AS_SFX:-.asm} 435 AS_SFX = ${AS_SFX:-.asm}
436 EXE_SFX = ${EXE_SFX} 436 EXE_SFX = ${EXE_SFX}
437 VCPROJ_SFX = ${VCPROJ_SFX} 437 VCPROJ_SFX = ${VCPROJ_SFX}
438 RTCD_OPTIONS = ${RTCD_OPTIONS} 438 RTCD_OPTIONS = ${RTCD_OPTIONS}
439 EOF 439 EOF
440 440
441 if enabled rvct; then cat >> $1 << EOF 441 if enabled rvct; then cat >> $1 << EOF
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 721
722 # PIC is probably what we want when building shared libs 722 # PIC is probably what we want when building shared libs
723 enabled shared && soft_enable pic 723 enabled shared && soft_enable pic
724 724
725 # Minimum iOS version for all target platforms (darwin and iphonesimulator). 725 # Minimum iOS version for all target platforms (darwin and iphonesimulator).
726 IOS_VERSION_MIN="6.0" 726 IOS_VERSION_MIN="6.0"
727 727
728 # Handle darwin variants. Newer SDKs allow targeting older 728 # Handle darwin variants. Newer SDKs allow targeting older
729 # platforms, so use the newest one available. 729 # platforms, so use the newest one available.
730 case ${toolchain} in 730 case ${toolchain} in
731 arm*-darwin*)
732 ios_sdk_dir="$(show_darwin_sdk_path iphoneos)"
733 if [ -d "${ios_sdk_dir}" ]; then
734 add_cflags "-isysroot ${ios_sdk_dir}"
735 add_ldflags "-isysroot ${ios_sdk_dir}"
736 fi
737 ;;
738 *-darwin*) 731 *-darwin*)
739 osx_sdk_dir="$(show_darwin_sdk_path macosx)" 732 osx_sdk_dir="$(show_darwin_sdk_path macosx)"
740 if [ -d "${osx_sdk_dir}" ]; then 733 if [ -d "${osx_sdk_dir}" ]; then
741 add_cflags "-isysroot ${osx_sdk_dir}" 734 add_cflags "-isysroot ${osx_sdk_dir}"
742 add_ldflags "-isysroot ${osx_sdk_dir}" 735 add_ldflags "-isysroot ${osx_sdk_dir}"
743 fi 736 fi
744 ;; 737 ;;
745 esac 738 esac
746 739
747 case ${toolchain} in 740 case ${toolchain} in
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 soft_enable neon 796 soft_enable neon
804 ;; 797 ;;
805 armv7|armv7s) 798 armv7|armv7s)
806 soft_enable neon 799 soft_enable neon
807 # Only enable neon_asm when neon is also enabled. 800 # Only enable neon_asm when neon is also enabled.
808 enabled neon && soft_enable neon_asm 801 enabled neon && soft_enable neon_asm
809 # If someone tries to force it through, die. 802 # If someone tries to force it through, die.
810 if disabled neon && enabled neon_asm; then 803 if disabled neon && enabled neon_asm; then
811 die "Disabling neon while keeping neon-asm is not supported" 804 die "Disabling neon while keeping neon-asm is not supported"
812 fi 805 fi
813 case ${toolchain} in 806 soft_enable media
814 *-darwin*)
815 # Neon is guaranteed on iOS 6+ devices, while old media extensions
816 # no longer assemble with iOS 9 SDK
817 ;;
818 *)
819 soft_enable media
820 esac
821 ;; 807 ;;
822 armv6) 808 armv6)
823 soft_enable media 809 soft_enable media
824 ;; 810 ;;
825 esac 811 esac
826 812
827 asm_conversion_cmd="cat" 813 asm_conversion_cmd="cat"
828 814
829 case ${tgt_cc} in 815 case ${tgt_cc} in
830 gcc) 816 gcc)
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 win*) 1060 win*)
1075 enabled gcc && add_cflags -fno-common 1061 enabled gcc && add_cflags -fno-common
1076 ;; 1062 ;;
1077 solaris*) 1063 solaris*)
1078 CC=${CC:-${CROSS}gcc} 1064 CC=${CC:-${CROSS}gcc}
1079 CXX=${CXX:-${CROSS}g++} 1065 CXX=${CXX:-${CROSS}g++}
1080 LD=${LD:-${CROSS}gcc} 1066 LD=${LD:-${CROSS}gcc}
1081 CROSS=${CROSS:-g} 1067 CROSS=${CROSS:-g}
1082 ;; 1068 ;;
1083 os2) 1069 os2)
1070 disable_feature pic
1084 AS=${AS:-nasm} 1071 AS=${AS:-nasm}
1072 add_ldflags -Zhigh-mem
1085 ;; 1073 ;;
1086 esac 1074 esac
1087 1075
1088 AS="${alt_as:-${AS:-auto}}" 1076 AS="${alt_as:-${AS:-auto}}"
1089 case ${tgt_cc} in 1077 case ${tgt_cc} in
1090 icc*) 1078 icc*)
1091 CC=${CC:-icc} 1079 CC=${CC:-icc}
1092 LD=${LD:-icc} 1080 LD=${LD:-icc}
1093 setup_gnu_toolchain 1081 setup_gnu_toolchain
1094 add_cflags -use-msasm # remove -use-msasm too? 1082 add_cflags -use-msasm # remove -use-msasm too?
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 # Prepare the PWD for building. 1405 # Prepare the PWD for building.
1418 for f in ${OOT_INSTALLS}; do 1406 for f in ${OOT_INSTALLS}; do
1419 install -D "${source_path}/$f" "$f" 1407 install -D "${source_path}/$f" "$f"
1420 done 1408 done
1421 fi 1409 fi
1422 cp "${source_path}/build/make/Makefile" . 1410 cp "${source_path}/build/make/Makefile" .
1423 1411
1424 clean_temp_files 1412 clean_temp_files
1425 true 1413 true
1426 } 1414 }
OLDNEW
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | source/libvpx/configure » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698