diff options
-rwxr-xr-x | Mumble.xcodeproj/project.pbxproj | 18 | ||||
-rw-r--r-- | Mumble.xcodeproj/xcshareddata/xcschemes/Mumble.xcscheme | 10 | ||||
m--------- | MumbleKit | 0 | ||||
-rw-r--r-- | Source/Info.plist | 7 |
4 files changed, 16 insertions, 19 deletions
diff --git a/Mumble.xcodeproj/project.pbxproj b/Mumble.xcodeproj/project.pbxproj index cbd338a..dcc4815 100755 --- a/Mumble.xcodeproj/project.pbxproj +++ b/Mumble.xcodeproj/project.pbxproj @@ -85,7 +85,6 @@ 2879528B14C3874C00567430 /* LeftBalloonSelected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2879528714C3874B00567430 /* LeftBalloonSelected@2x.png */; }; 2879528C14C3874C00567430 /* RightBalloonSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 2879528814C3874C00567430 /* RightBalloonSelected.png */; }; 2879528D14C3874C00567430 /* RightBalloonSelected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2879528914C3874C00567430 /* RightBalloonSelected@2x.png */; }; - 2879528F14C38FC200567430 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2879528E14C38FC200567430 /* MobileCoreServices.framework */; }; 287952B014C4D67500567430 /* MUMessageRecipientViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 287952AF14C4D67500567430 /* MUMessageRecipientViewController.m */; }; 287A686714C6FB9F008B1BE7 /* GrayCheckmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 287A686514C6FB9F008B1BE7 /* GrayCheckmark.png */; }; 287A686814C6FB9F008B1BE7 /* GrayCheckmark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 287A686614C6FB9F008B1BE7 /* GrayCheckmark@2x.png */; }; @@ -190,6 +189,7 @@ 28FAA35F14D74C1600F6D711 /* SmallMumbleIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 28FAA35D14D74C1600F6D711 /* SmallMumbleIcon.png */; }; 28FAA36014D74C1600F6D711 /* SmallMumbleIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28FAA35E14D74C1600F6D711 /* SmallMumbleIcon@2x.png */; }; 28FAA36414D7551600F6D711 /* MKNumberBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 28FAA36314D7551600F6D711 /* MKNumberBadgeView.m */; }; + 337ACFEB25BC8393005E1A62 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 337ACFEA25BC8393005E1A62 /* CoreServices.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -482,6 +482,7 @@ 28FAA36314D7551600F6D711 /* MKNumberBadgeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MKNumberBadgeView.m; path = Dependencies/MKNumberBadgeView/MKNumberBadgeView.m; sourceTree = "<group>"; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/main.m; sourceTree = "<group>"; }; 32CA4F630368D1EE00C91783 /* Mumble.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mumble.pch; path = Source/Mumble.pch; sourceTree = "<group>"; }; + 337ACFEA25BC8393005E1A62 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -490,11 +491,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2879528F14C38FC200567430 /* MobileCoreServices.framework in Frameworks */, 28F79C6D14796B2F0003B8BA /* libsqlite3.dylib in Frameworks */, 28990AB1132FDA540034B406 /* libMumbleKit.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, + 337ACFEB25BC8393005E1A62 /* CoreServices.framework in Frameworks */, 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, 2861C2AE116BE9B5002B8514 /* AudioToolbox.framework in Frameworks */, 2861C2B2116BE9B7002B8514 /* CFNetwork.framework in Frameworks */, @@ -932,6 +933,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 337ACFEA25BC8393005E1A62 /* CoreServices.framework */, 28990AB0132FDA540034B406 /* libMumbleKit.a */, 28F79C6C14796B2E0003B8BA /* libsqlite3.dylib */, 2879528E14C38FC200567430 /* MobileCoreServices.framework */, @@ -993,7 +995,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0700; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 1230; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = CXBDCLUHDT; @@ -1002,15 +1004,15 @@ }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Mumble" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( - English, - Japanese, - French, - German, en, da, + de, + fr, + ja, + Base, ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; diff --git a/Mumble.xcodeproj/xcshareddata/xcschemes/Mumble.xcscheme b/Mumble.xcodeproj/xcshareddata/xcschemes/Mumble.xcscheme index d7787b1..702ec4d 100644 --- a/Mumble.xcodeproj/xcshareddata/xcschemes/Mumble.xcscheme +++ b/Mumble.xcodeproj/xcshareddata/xcschemes/Mumble.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0810" + LastUpgradeVersion = "1230" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:Mumble.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Release" @@ -61,8 +59,6 @@ ReferencedContainer = "container:Mumble.xcodeproj"> </BuildableReference> </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" diff --git a/MumbleKit b/MumbleKit -Subproject c1fa79d2b2e792563ef2acfcb6ff2e8aae719e5 +Subproject b59f03355a30c30693e82cfd17bc8f929f801f7 diff --git a/Source/Info.plist b/Source/Info.plist index d6486bb..40aba64 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -63,13 +63,14 @@ </array> <key>CFBundleVersion</key> <string>1003001001</string> - <key>LSRequiresIPhoneOS</key> - <true/> <key>NSMainNibFile</key> <string>MainWindow</string> + <key>NSMicrophoneUsageDescription</key> + <string>Mumble uses your microphone for voice chats</string> <key>UIBackgroundModes</key> <array> <string>audio</string> + <string>voip</string> </array> <key>UIFileSharingEnabled</key> <true/> @@ -102,8 +103,6 @@ <true/> <key>UIStatusBarStyle</key> <string>UIStatusBarStyleBlackOpaque</string> - <key>NSMicrophoneUsageDescription</key> - <string>Mumble uses your microphone for voice chats</string> <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> |