shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove ios-version.sh"

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -751,13 +751,14 @@

   enabled shared && soft_enable pic

   # Minimum iOS version for all target platforms (darwin and iphonesimulator).

+  # Shared library framework builds are only possible on iOS 8 and later.

   if enabled shared; then

     IOS_VERSION_OPTIONS="--enable-shared"

+    IOS_VERSION_MIN="8.0"

   else

     IOS_VERSION_OPTIONS=""

+    IOS_VERSION_MIN="6.0"

   fi

-  IOS_VERSION_MIN=$("${source_path}/build/make/ios-version.sh" \

-    ${IOS_VERSION_OPTIONS})

   # Handle darwin variants. Newer SDKs allow targeting older

   # platforms, so use the newest one available.

--- a/build/make/ios-version.sh

+++ /dev/null

@@ -1,17 +1,0 @@

-#!/bin/sh

-##

-##  Copyright (c) 2016 The WebM project authors. All Rights Reserved.

-##

-##  Use of this source code is governed by a BSD-style license

-##  that can be found in the LICENSE file in the root of the source

-##  tree. An additional intellectual property rights grant can be found

-##  in the file PATENTS.  All contributing project authors may

-##  be found in the AUTHORS file in the root of the source tree.

-##

-

-if [ "$1" = "--enable-shared" ]; then

-  # Shared library framework builds are only possible on iOS 8 and later.

-  echo "8.0"

-else

-  echo "6.0"

-fi