ref: 9b1a2aa82b214c12a57537e4885902c3dd9d05f1
parent: ad1aad69fbed8ccb23d7eeb1e642766f2cdf9a28
parent: 6d38ad414623d49ff542230a09c243e4f2e4cf5a
author: Jerome Jiang <jianj@google.com>
date: Fri Jan 27 16:15:52 EST 2017
Merge "Add macOS Sierra support in configure"
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README - 9 January 2017
+README - 26 January 2017
Welcome to the WebM VP8/VP9 Codec SDK!
@@ -74,6 +74,7 @@
x86-darwin13-gcc
x86-darwin14-gcc
x86-darwin15-gcc
+ x86-darwin16-gcc
x86-iphonesimulator-gcc
x86-linux-gcc
x86-linux-icc
@@ -92,6 +93,7 @@
x86_64-darwin13-gcc
x86_64-darwin14-gcc
x86_64-darwin15-gcc
+ x86_64-darwin16-gcc
x86_64-iphonesimulator-gcc
x86_64-linux-gcc
x86_64-linux-icc
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -725,6 +725,10 @@
tgt_isa=x86_64
tgt_os=darwin15
;;
+ *darwin16*)
+ tgt_isa=x86_64
+ tgt_os=darwin16
+ ;;
x86_64*mingw32*)
tgt_os=win64
;;
@@ -845,6 +849,10 @@
*-darwin15-*)
add_cflags "-mmacosx-version-min=10.11"
add_ldflags "-mmacosx-version-min=10.11"
+ ;;
+ *-darwin16-*)
+ add_cflags "-mmacosx-version-min=10.12"
+ add_ldflags "-mmacosx-version-min=10.12"
;;
*-iphonesimulator-*)
add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"--- a/build/make/iosbuild.sh
+++ b/build/make/iosbuild.sh
@@ -35,8 +35,8 @@
armv7s-darwin-gcc"
SIM_TARGETS="x86-iphonesimulator-gcc
x86_64-iphonesimulator-gcc"
-OSX_TARGETS="x86-darwin15-gcc
- x86_64-darwin15-gcc"
+OSX_TARGETS="x86-darwin16-gcc
+ x86_64-darwin16-gcc"
TARGETS="${ARM_TARGETS} ${SIM_TARGETS}"# Configures for the target specified by $1, and invokes make with the dist
@@ -271,7 +271,7 @@
--help: Display this message and exit.
--enable-shared: Build a dynamic framework for use on iOS 8 or later.
--extra-configure-args <args>: Extra args to pass when configuring libvpx.
- --macosx: Uses darwin15 targets instead of iphonesimulator targets for x86
+ --macosx: Uses darwin16 targets instead of iphonesimulator targets for x86
and x86_64. Allows linking to framework when builds target MacOSX
instead of iOS.
--preserve-build-output: Do not delete the build directory.
--- a/configure
+++ b/configure
@@ -125,6 +125,7 @@
all_platforms="${all_platforms} x86-darwin13-gcc" all_platforms="${all_platforms} x86-darwin14-gcc" all_platforms="${all_platforms} x86-darwin15-gcc"+all_platforms="${all_platforms} x86-darwin16-gcc" all_platforms="${all_platforms} x86-iphonesimulator-gcc" all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc"@@ -143,6 +144,7 @@
all_platforms="${all_platforms} x86_64-darwin13-gcc" all_platforms="${all_platforms} x86_64-darwin14-gcc" all_platforms="${all_platforms} x86_64-darwin15-gcc"+all_platforms="${all_platforms} x86_64-darwin16-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"