From 3136a14e5dceee95ccf59d5f6dc07dfa31b3b178 Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Fri, 7 Oct 2016 05:49:14 +0000 Subject: Re #1941: Add support to specify min iOS versions in configure-iphone and update the default for ipjsua sample app git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5453 74dad513-b988-da41-8d7b-12977e46ad98 --- configure-iphone | 12 +++++++++++- pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj | 14 +++++++------- pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist | 2 ++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/configure-iphone b/configure-iphone index cf399189..56ecbdc8 100755 --- a/configure-iphone +++ b/configure-iphone @@ -18,7 +18,10 @@ if test "$*" = "--help" -o "$*" = "-h"; then echo " to use. By default, the compiler is deduced from the" echo " SDK." echo " ARCH Optional flags to specify target architecture, e.g." - echo " ARCH='-arch armv6'. Default is armv7." + echo " ARCH=\"-arch armv6\". Default is armv7." + echo " MIN_IOS Optional flags to specify minimum supported iOS" + echo " versions, e.g. MIN_IOS=\"-miphoneos-version-min=10.0\". " + echo " Default is 7.0." echo "" exit 0 fi @@ -115,6 +118,13 @@ if test "${ARCH}" = ""; then fi export ARCH_VAL=`echo ${ARCH} | sed 's/\-arch //' | sed -e 's/^[ \t]*//;s/[ \t]*$//' ` +if test "${MIN_IOS}" = ""; then + MIN_IOS="7.0" + echo "$F: MIN_IOS is not specified, choosing ${MIN_IOS}" + CFLAGS="${CFLAGS} -miphoneos-version-min=${MIN_IOS}" + LDFLAGS="${LDFLAGS} -miphoneos-version-min=${MIN_IOS}" +fi + # Set CXX if not set if test "${CXX}" = ""; then export CXX=`echo ${CC} | sed 's/gcc/g++/'` diff --git a/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj b/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj index 8ad0b3a7..1780f860 100644 --- a/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj +++ b/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3A31F1B01DA4F54B007C23A3 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A31F1AF1DA4F54B007C23A3 /* libstdc++.tbd */; }; 3A31F1B21DA4F568007C23A3 /* libwebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A31F1B11DA4F568007C23A3 /* libwebrtc.a */; }; 3AA31FF618F3FB4C00112C3D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */; }; 3AA31FF718F3FB4C00112C3D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */; }; @@ -22,6 +21,7 @@ 3AA3200018F3FB4C00112C3D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF318F3FB4C00112C3D /* Foundation.framework */; }; 3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */; }; 3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF518F3FB4C00112C3D /* UIKit.framework */; }; + 3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AB0EC571DA76B39008A0F62 /* libc++.tbd */; }; 3ADCCD171715338D0007BE8E /* pjsua.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ADCCD161715338D0007BE8E /* pjsua.png */; }; 3ADCCD2D172E40120007BE8E /* pjsua_app_cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */; }; 3ADCCD2E172E40120007BE8E /* pjsua_app_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD29172E40120007BE8E /* pjsua_app_common.c */; }; @@ -58,8 +58,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3A31F1AF1DA4F54B007C23A3 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; - 3A31F1B11DA4F568007C23A3 /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc.a; path = libwebrtc.a; sourceTree = ""; }; + 3A31F1B11DA4F568007C23A3 /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebrtc.a; sourceTree = ""; }; 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; @@ -73,6 +72,7 @@ 3AA31FF318F3FB4C00112C3D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 3AA31FF518F3FB4C00112C3D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 3AB0EC571DA76B39008A0F62 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 3ADCCD161715338D0007BE8E /* pjsua.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pjsua.png; sourceTree = ""; }; 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_cli.c; path = ../../pjsua_app_cli.c; sourceTree = ""; }; 3ADCCD29172E40120007BE8E /* pjsua_app_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_common.c; path = ../../pjsua_app_common.c; sourceTree = ""; }; @@ -118,7 +118,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3A31F1B01DA4F54B007C23A3 /* libstdc++.tbd in Frameworks */, + 3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */, E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */, 3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */, E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */, @@ -190,7 +190,7 @@ 3AF0580716F050770046B835 /* Frameworks */ = { isa = PBXGroup; children = ( - 3A31F1AF1DA4F54B007C23A3 /* libstdc++.tbd */, + 3AB0EC571DA76B39008A0F62 /* libc++.tbd */, 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */, 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */, 3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */, @@ -402,7 +402,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -424,7 +424,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist b/pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist index 3811acf4..abd57175 100644 --- a/pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist +++ b/pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist @@ -42,5 +42,7 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown + UIRequiresFullScreen + -- cgit v1.2.3