ref: 0b6e35a90dea29cafe52a475e3e7be0dd58e31cd
parent: bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7
parent: 8cfe9607d90a18a13c84bfb2f4d0d3ff2424049a
author: hkuang <hkuang@google.com>
date: Thu Jan 22 13:19:04 EST 2015
Merge branch 'master' of ssh://gerrit.chromium.org:29418/webm/libvpx * 'master' of ssh://gerrit.chromium.org:29418/webm/libvpx: Add libvpx build targets for OS X 10.10 Yosemite.
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -666,6 +666,10 @@
tgt_isa=x86_64
tgt_os=darwin13
;;
+ *darwin14*)
+ tgt_isa=x86_64
+ tgt_os=darwin14
+ ;;
x86_64*mingw32*)
tgt_os=win64
;;
@@ -774,6 +778,10 @@
*-darwin13-*)
add_cflags "-mmacosx-version-min=10.9"
add_ldflags "-mmacosx-version-min=10.9"
+ ;;
+ *-darwin14-*)
+ add_cflags "-mmacosx-version-min=10.10"
+ add_ldflags "-mmacosx-version-min=10.10"
;;
*-iphonesimulator-*)
add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"--- a/configure
+++ b/configure
@@ -129,6 +129,7 @@
all_platforms="${all_platforms} x86-darwin11-gcc" all_platforms="${all_platforms} x86-darwin12-gcc" all_platforms="${all_platforms} x86-darwin13-gcc"+all_platforms="${all_platforms} x86-darwin14-gcc" all_platforms="${all_platforms} x86-iphonesimulator-gcc" all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc"@@ -146,6 +147,7 @@
all_platforms="${all_platforms} x86_64-darwin11-gcc" all_platforms="${all_platforms} x86_64-darwin12-gcc" all_platforms="${all_platforms} x86_64-darwin13-gcc"+all_platforms="${all_platforms} x86_64-darwin14-gcc" all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc"@@ -162,6 +164,7 @@
all_platforms="${all_platforms} universal-darwin11-gcc" all_platforms="${all_platforms} universal-darwin12-gcc" all_platforms="${all_platforms} universal-darwin13-gcc"+all_platforms="${all_platforms} universal-darwin14-gcc" all_platforms="${all_platforms} generic-gnu"# all_targets is a list of all targets that can be configured