Changeset 3312 for pjproject/trunk

Timestamp:

Sep 15, 2010 12:29:04 PM (14 years ago)

Author:

ming

Message:

Closed #1128: ipjsua - add support for iPad
Add support for iPad as one universal application.

Location:

pjproject/trunk/pjsip-apps/src/ipjsua

Files:

• Resources-iPad (added)
• Resources-iPad/MainWindow-iPad.xib (added)
• Resources-iPad/SecondView-iPad.xib (added)
• ipjsua-Info.plist (modified) (2 diffs)
• ipjsua.xcodeproj/project.pbxproj (modified) (12 diffs)

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

@@ -27 +27 @@
         <key>NSMainNibFile</key>
         <string>MainWindow</string>
-        <key>UIInterfaceOrientation</key>
-        <string>UIInterfaceOrientationLandscapeRight</string>
+        <key>NSMainNibFile~ipad</key>
+        <string>MainWindow-iPad</string>
         <key>UIBackgroundModes</key>
         <array>
@@ -34 +34 @@
                 <string>voip</string>
         </array>
+        <key>UIInterfaceOrientation</key>
+        <string>UIInterfaceOrientationLandscapeRight</string>
 </dict>
 </plist>

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

@@ -17 +17 @@
                 28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD73870D9D96C1002E5188 /* MainWindow.xib */; };
                 3A0D789F121E324E009D5030 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A0D789E121E324E009D5030 /* CFNetwork.framework */; };
+                3A0D7ECD123DD46C009D5030 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A0D7ECC123DD46C009D5030 /* MainWindow-iPad.xib */; };
+                3A0D7F20123F2254009D5030 /* SecondView-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A0D7F1F123F2254009D5030 /* SecondView-iPad.xib */; };
                 3AE9099D11587BB900FAEAA5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AE9099C11587BB900FAEAA5 /* AudioToolbox.framework */; };
                 3AE90A2D1158B52500FAEAA5 /* pjsua_app.c in Sources */ = {isa = PBXBuildFile; fileRef = 3AE90A2C1158B52500FAEAA5 /* pjsua_app.c */; };
@@ -56 +58 @@
                 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
                 3A0D789E121E324E009D5030 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+                3A0D7ECC123DD46C009D5030 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = "<group>"; };
+                3A0D7F1F123F2254009D5030 /* SecondView-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "SecondView-iPad.xib"; path = "Resources-iPad/SecondView-iPad.xib"; sourceTree = "<group>"; };
                 3AE9099C11587BB900FAEAA5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
                 3AE90A2C1158B52500FAEAA5 /* pjsua_app.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app.c; path = ../pjsua/pjsua_app.c; sourceTree = SOURCE_ROOT; };
@@ -148 +152 @@
                                 29B97315FDCFA39411CA2CEA /* Other Sources */,
                                 29B97317FDCFA39411CA2CEA /* Resources */,
+                                3A0D7ECB123DD46C009D5030 /* Resources-iPad */,
                                 29B97323FDCFA39411CA2CEA /* Frameworks */,
                                 3AE909B211587D2700FAEAA5 /* Libraries */,
@@ -187 +192 @@
                         );
                         name = Frameworks;
+                        sourceTree = "<group>";
+                };
+                3A0D7ECB123DD46C009D5030 /* Resources-iPad */ = {
+                        isa = PBXGroup;
+                        children = (
+                                3A0D7F1F123F2254009D5030 /* SecondView-iPad.xib */,
+                                3A0D7ECC123DD46C009D5030 /* MainWindow-iPad.xib */,
+                        );
+                        name = "Resources-iPad";
                         sourceTree = "<group>";
                 };
@@ -262 +276 @@
                                 282CCBFE0DB6C98000C4EA27 /* SecondView.xib in Resources */,
                                 3AE90AC01158F0C400FAEAA5 /* config.cfg in Resources */,
+                                3A0D7ECD123DD46C009D5030 /* MainWindow-iPad.xib in Resources */,
+                                3A0D7F20123F2254009D5030 /* SecondView-iPad.xib in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -288 +304 @@
                         buildSettings = {
                                 ALWAYS_SEARCH_USER_PATHS = NO;
+                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 COPY_PHASE_STRIP = NO;
                                 GCC_DYNAMIC_NO_PIC = NO;
@@ -294 +311 @@
                                 GCC_PREFIX_HEADER = ipjsua_Prefix.pch;
                                 INFOPLIST_FILE = "ipjsua-Info.plist";
+                                IPHONEOS_DEPLOYMENT_TARGET = 3.2;
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
@@ -304 +322 @@
                                 );
                                 PRODUCT_NAME = ipjsua;
+                                SDKROOT = iphoneos3.2;
+                                TARGETED_DEVICE_FAMILY = "1,2";
                         };
                         name = Debug;
@@ -311 +331 @@
                         buildSettings = {
                                 ALWAYS_SEARCH_USER_PATHS = NO;
+                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 COPY_PHASE_STRIP = YES;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                 GCC_PREFIX_HEADER = ipjsua_Prefix.pch;
                                 INFOPLIST_FILE = "ipjsua-Info.plist";
+                                IPHONEOS_DEPLOYMENT_TARGET = 3.2;
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
@@ -325 +347 @@
                                 );
                                 PRODUCT_NAME = ipjsua;
+                                SDKROOT = iphoneos3.2;
+                                TARGETED_DEVICE_FAMILY = "1,2";
                         };
                         name = Release;
@@ -354 +378 @@
                                 OTHER_CFLAGS = "";
                                 PREBINDING = NO;
-                                SDKROOT = iphoneos4.0;
+                                SDKROOT = iphoneos3.2;
                         };
                         name = Debug;
@@ -384 +408 @@
                                 OTHER_CFLAGS = "";
                                 PREBINDING = NO;
-                                SDKROOT = iphoneos4.0;
+                                SDKROOT = iphoneos3.2;
                         };
                         name = Release;