Changeset 5453

Timestamp:

Oct 7, 2016 5:49:14 AM (8 years ago)

Author:

ming

Message:

Re #1941: Add support to specify min iOS versions in configure-iphone and update the default for ipjsua sample app

Location:

pjproject/trunk

Files:

• configure-iphone (modified) (2 diffs)
• pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj (modified) (8 diffs)
• pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist (modified) (1 diff)

pjproject/trunk/configure-iphone

@@ -19 +19 @@
   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
@@ -116 +119 @@
 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

pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* 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 */; };
@@ -23 +22 @@
                 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 */; };
@@ -59 +59 @@
 
 /* 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 = "<group>"; };
+                3A31F1B11DA4F568007C23A3 /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebrtc.a; sourceTree = "<group>"; };
                 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; };
@@ -74 +73 @@
                 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 = "<group>"; };
                 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_cli.c; path = ../../pjsua_app_cli.c; sourceTree = "<group>"; };
@@ -119 +119 @@
                         buildActionMask = 2147483647;
                         files = (
-                                3A31F1B01DA4F54B007C23A3 /* libstdc++.tbd in Frameworks */,
+                                3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */,
                                 E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */,
                                 3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */,
@@ -191 +191 @@
                         isa = PBXGroup;
                         children = (
-                                3A31F1AF1DA4F54B007C23A3 /* libstdc++.tbd */,
+                                3AB0EC571DA76B39008A0F62 /* libc++.tbd */,
                                 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */,
                                 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */,
@@ -403 +403 @@
                                 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";
@@ -425 +425 @@
                                 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;

pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist

@@ -43 +43 @@
                 <string>UIInterfaceOrientationPortraitUpsideDown</string>
         </array>
+        <key>UIRequiresFullScreen</key>
+        <true/>
 </dict>
 </plist>