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

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

Issue 1217053002: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 5 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/build/make/msvs_common.sh » ('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 710 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 ;;
731 *-darwin*) 738 *-darwin*)
732 osx_sdk_dir="$(show_darwin_sdk_path macosx)" 739 osx_sdk_dir="$(show_darwin_sdk_path macosx)"
733 if [ -d "${osx_sdk_dir}" ]; then 740 if [ -d "${osx_sdk_dir}" ]; then
734 add_cflags "-isysroot ${osx_sdk_dir}" 741 add_cflags "-isysroot ${osx_sdk_dir}"
735 add_ldflags "-isysroot ${osx_sdk_dir}" 742 add_ldflags "-isysroot ${osx_sdk_dir}"
736 fi 743 fi
737 ;; 744 ;;
738 esac 745 esac
739 746
740 case ${toolchain} in 747 case ${toolchain} in
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 soft_enable neon 803 soft_enable neon
797 ;; 804 ;;
798 armv7|armv7s) 805 armv7|armv7s)
799 soft_enable neon 806 soft_enable neon
800 # Only enable neon_asm when neon is also enabled. 807 # Only enable neon_asm when neon is also enabled.
801 enabled neon && soft_enable neon_asm 808 enabled neon && soft_enable neon_asm
802 # If someone tries to force it through, die. 809 # If someone tries to force it through, die.
803 if disabled neon && enabled neon_asm; then 810 if disabled neon && enabled neon_asm; then
804 die "Disabling neon while keeping neon-asm is not supported" 811 die "Disabling neon while keeping neon-asm is not supported"
805 fi 812 fi
806 soft_enable media 813 case ${toolchain} in
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
807 ;; 821 ;;
808 armv6) 822 armv6)
809 soft_enable media 823 soft_enable media
810 ;; 824 ;;
811 esac 825 esac
812 826
813 asm_conversion_cmd="cat" 827 asm_conversion_cmd="cat"
814 828
815 case ${tgt_cc} in 829 case ${tgt_cc} in
816 gcc) 830 gcc)
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 # Prepare the PWD for building. 1423 # Prepare the PWD for building.
1410 for f in ${OOT_INSTALLS}; do 1424 for f in ${OOT_INSTALLS}; do
1411 install -D "${source_path}/$f" "$f" 1425 install -D "${source_path}/$f" "$f"
1412 done 1426 done
1413 fi 1427 fi
1414 cp "${source_path}/build/make/Makefile" . 1428 cp "${source_path}/build/make/Makefile" .
1415 1429
1416 clean_temp_files 1430 clean_temp_files
1417 true 1431 true
1418 } 1432 }
OLDNEW
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | source/libvpx/build/make/msvs_common.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698