From 8de1e36e5f8d25d1b80be19a350e0bb043c332b8 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 30 Jul 2010 11:55:52 +0200 Subject: [PATCH] remove hard dependencies on liblinphone subproject --- linphone-Info.plist | 20 +++++++++++--------- linphone.xcodeproj/project.pbxproj | 12 +++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index ba4b50473..634ac9945 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -2,10 +2,10 @@ + UIApplicationExitsOnSuspend + CFBundleDevelopmentRegion English - UIRequiresPersistentWiFi - CFBundleDisplayName Linphone CFBundleExecutable @@ -20,23 +20,25 @@ ${PRODUCT_NAME} CFBundlePackageType APPL + CFBundleShortVersionString + 3.3.0 CFBundleSignature ???? CFBundleVersion 1.0.2 - CFBundleShortVersionString - 3.3.0 NSMainNibFile PhoneMainView - UIRequiredDeviceCapabilities - - wifi - microphone - UIBackgroundModes voip audio + UIRequiredDeviceCapabilities + + wifi + microphone + + UIRequiresPersistentWiFi + diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 275e6bced..0b3dafd93 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -34,6 +34,7 @@ 2242D9C910D691F900E9963F /* GenericTabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2242D9C810D691F900E9963F /* GenericTabViewController.m */; }; 2245671D107699F700F10948 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2245671C107699F700F10948 /* Settings.bundle */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; }; + 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; @@ -45,7 +46,6 @@ 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; }; - 22A10EAF11F88F0800373793 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22A10DA311F88C1F00373793 /* liblinphone.a */; }; 22A10F3911F8960300373793 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2A10765B400068D98F /* liblinphone.a */; }; 22A10F3A11F8960300373793 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2B10765B400068D98F /* libmediastreamer.a */; }; 22A10F3B11F8960300373793 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; }; @@ -54,7 +54,6 @@ 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; }; 22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A783111C1BA800B04932 /* Speaker-32-on.png */; }; 22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A784111C1BA800B04932 /* Speaker-32-off.png */; }; - 22E0A821111C44E100B04932 /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 22E0A822111C44E100B04932 /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; @@ -70,7 +69,7 @@ isa = PBXContainerItemProxy; containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D /* liblinphone.a */; + remoteGlobalIDString = D2AAC07E0554694100DB518D; remoteInfo = liblinphone; }; /* End PBXContainerItemProxy section */ @@ -215,6 +214,7 @@ 2242D9C810D691F900E9963F /* GenericTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericTabViewController.m; sourceTree = ""; }; 2245671C107699F700F10948 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 2245F77E1201D2AF00C4179D /* linphone-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "linphone-Info copy.plist"; sourceTree = ""; }; 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = ""; }; 225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = ""; }; @@ -231,7 +231,6 @@ 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallHistoryTableViewController.xib; sourceTree = ""; }; 228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = liblinphone.xcodeproj; path = submodules/liblinphone.xcodeproj; sourceTree = ""; }; - 22A10E9711F88D4D00373793 /* Debug-iphoneos */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Debug-iphoneos"; path = "submodules/build/Debug-iphoneos"; sourceTree = ""; }; 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; 22B5EFE310CE5E5800777D97 /* ContactPickerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactPickerDelegate.h; sourceTree = ""; }; 22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactPickerDelegate.m; sourceTree = ""; }; @@ -260,7 +259,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22A10EAF11F88F0800373793 /* liblinphone.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, @@ -549,7 +547,6 @@ 2264B6D111200342002C2C53 /* SystemConfiguration.framework */, 2258633C11410BAC00C5A737 /* README */, 228697C311AC29B800E9E0CA /* CFNetwork.framework */, - 22A10E9711F88D4D00373793 /* Debug-iphoneos */, ); name = CustomTemplate; sourceTree = ""; @@ -587,6 +584,7 @@ 8D1107310486CEB800E47090 /* linphone-Info.plist */, 2274550710700509006EC466 /* linphonerc */, 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */, + 2245F77E1201D2AF00C4179D /* linphone-Info copy.plist */, ); name = Resources; sourceTree = ""; @@ -673,7 +671,6 @@ 2242D91B10D66C2100E9963F /* mic_muted.png in Resources */, 22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */, 22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */, - 22E0A821111C44E100B04932 /* MoreViewController.xib in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, 22058C71116E305000B08DDD /* icone-linphone-57.png in Resources */, 22226C12118197C0000CA27B /* startcall-green.png in Resources */, @@ -685,6 +682,7 @@ 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */, 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */, 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */, + 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };