Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble-iphoneos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BuildConfig/AppStore.xcconfig7
-rw-r--r--BuildConfig/Base.xcconfig36
-rw-r--r--BuildConfig/BetaDist.xcconfig7
-rw-r--r--BuildConfig/Debug.xcconfig9
-rw-r--r--BuildConfig/Release.xcconfig13
-rwxr-xr-xMumble.xcodeproj/project.pbxproj178
m---------MumbleKit0
7 files changed, 104 insertions, 146 deletions
diff --git a/BuildConfig/AppStore.xcconfig b/BuildConfig/AppStore.xcconfig
new file mode 100644
index 0000000..08caa8f
--- /dev/null
+++ b/BuildConfig/AppStore.xcconfig
@@ -0,0 +1,7 @@
+// Copyright 2012 The Mumble for iOS Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "Release.xcconfig"
+
+GCC_PREPROCESSOR_DEFINITIONS = MUMBLE_APP_STORE=1
diff --git a/BuildConfig/Base.xcconfig b/BuildConfig/Base.xcconfig
new file mode 100644
index 0000000..6ce0c2d
--- /dev/null
+++ b/BuildConfig/Base.xcconfig
@@ -0,0 +1,36 @@
+// Copyright 2012 The Mumble for iOS Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+ARCHS = $(ARCHS_STANDARD_32_BIT)
+SDKROOT = iphoneos
+
+MACOSX_DEPLOYMENT_TARGET = 10.7
+IPHONEOS_DEPLOYMENT_TARGET = 5.0
+
+CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
+
+IPHONEOS_DEPLOYMENT_TARGET = 5.0
+
+TARGETED_DEVICE_FAMILY = 1 // iPhone
+
+ALWAYS_SEARCH_USER_PATHS = NO
+USER_HEADER_SEARCH_PATHS =
+HEADER_SEARCH_PATHS = ${PROJECT_DIR}/MumbleKit/src/ ${PROJECT_DIR}/Dependencies/fmdb/src/ ${PROJECT_DIR}/Dependencies/gtm/ ${PROJECT_DIR}/Dependencies/MKNumberBadgeView/ ${PROJECT_DIR}/Dependencies/plcrashreporter
+FRAMEWORK_SEARCH_PATHS =
+
+OTHER_CFLAGS = -DNS_BLOCK_ASSERTIONS=1
+
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+
+INFOPLIST_FILE = Source/Info.plist
+
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+GCC_PREFIX_HEADER = Source/Mumble.pch
+
+VALIDATE_PRODUCT = YES
+
+OTHER_LDFLAGS = -all_load -ObjC
+
+PRODUCT_NAME = Mumble \ No newline at end of file
diff --git a/BuildConfig/BetaDist.xcconfig b/BuildConfig/BetaDist.xcconfig
new file mode 100644
index 0000000..0c0ffbd
--- /dev/null
+++ b/BuildConfig/BetaDist.xcconfig
@@ -0,0 +1,7 @@
+// Copyright 2012 The Mumble for iOS Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "Release.xcconfig"
+
+GCC_PREPROCESSOR_DEFINITIONS = MUMBLE_BETA_DIST=1 \ No newline at end of file
diff --git a/BuildConfig/Debug.xcconfig b/BuildConfig/Debug.xcconfig
new file mode 100644
index 0000000..5da77b8
--- /dev/null
+++ b/BuildConfig/Debug.xcconfig
@@ -0,0 +1,9 @@
+// Copyright 2012 The Mumble for iOS Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "Base.xcconfig"
+
+COPY_PHASE_STRIP = NO
+
+GCC_OPTIMIZATION_LEVEL = 0 \ No newline at end of file
diff --git a/BuildConfig/Release.xcconfig b/BuildConfig/Release.xcconfig
new file mode 100644
index 0000000..202e041
--- /dev/null
+++ b/BuildConfig/Release.xcconfig
@@ -0,0 +1,13 @@
+// Copyright 2012 The Mumble for iOS Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include "Base.xcconfig"
+
+COPY_PHASE_STRIP = YES
+
+CODE_SIGN_IDENTITY = iPhone Distribution: Mikkel Krautz
+
+GCC_FAST_MATH = YES
+GCC_UNROLL_LOOPS = YES
+GCC_OPTIMIZATION_LEVEL = 3 \ No newline at end of file
diff --git a/Mumble.xcodeproj/project.pbxproj b/Mumble.xcodeproj/project.pbxproj
index 30c0217..88fe4a9 100755
--- a/Mumble.xcodeproj/project.pbxproj
+++ b/Mumble.xcodeproj/project.pbxproj
@@ -27,6 +27,11 @@
2858A580123B9E5700A82155 /* MUCertificateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2858A57F123B9E5700A82155 /* MUCertificateCell.xib */; };
2858A5AD123BA08D00A82155 /* MUCertificateCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2858A5AC123BA08D00A82155 /* MUCertificateCell.m */; };
2858DBA31233E31B000D6F75 /* MUVersionChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 2858DBA21233E31B000D6F75 /* MUVersionChecker.m */; };
+ 285E2A65150D729B008AE185 /* AppStore.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 285E2A60150D729B008AE185 /* AppStore.xcconfig */; };
+ 285E2A66150D729B008AE185 /* Base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 285E2A61150D729B008AE185 /* Base.xcconfig */; };
+ 285E2A67150D729B008AE185 /* BetaDist.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 285E2A62150D729B008AE185 /* BetaDist.xcconfig */; };
+ 285E2A68150D729B008AE185 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 285E2A63150D729B008AE185 /* Debug.xcconfig */; };
+ 285E2A69150D729B008AE185 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 285E2A64150D729B008AE185 /* Release.xcconfig */; };
2861C276116BE905002B8514 /* MUApplicationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2861C25E116BE905002B8514 /* MUApplicationDelegate.m */; };
2861C27B116BE905002B8514 /* MUPublicServerList.m in Sources */ = {isa = PBXBuildFile; fileRef = 2861C267116BE905002B8514 /* MUPublicServerList.m */; };
2861C27C116BE905002B8514 /* MUPublicServerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2861C269116BE905002B8514 /* MUPublicServerListController.m */; };
@@ -236,6 +241,11 @@
2858A5AC123BA08D00A82155 /* MUCertificateCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MUCertificateCell.m; sourceTree = "<group>"; };
2858DBA11233E31B000D6F75 /* MUVersionChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MUVersionChecker.h; sourceTree = "<group>"; };
2858DBA21233E31B000D6F75 /* MUVersionChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MUVersionChecker.m; sourceTree = "<group>"; };
+ 285E2A60150D729B008AE185 /* AppStore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = AppStore.xcconfig; path = BuildConfig/AppStore.xcconfig; sourceTree = "<group>"; };
+ 285E2A61150D729B008AE185 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Base.xcconfig; path = BuildConfig/Base.xcconfig; sourceTree = "<group>"; };
+ 285E2A62150D729B008AE185 /* BetaDist.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BetaDist.xcconfig; path = BuildConfig/BetaDist.xcconfig; sourceTree = "<group>"; };
+ 285E2A63150D729B008AE185 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = BuildConfig/Debug.xcconfig; sourceTree = "<group>"; };
+ 285E2A64150D729B008AE185 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = BuildConfig/Release.xcconfig; sourceTree = "<group>"; };
2861C25D116BE905002B8514 /* MUApplicationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MUApplicationDelegate.h; sourceTree = "<group>"; };
2861C25E116BE905002B8514 /* MUApplicationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MUApplicationDelegate.m; sourceTree = "<group>"; };
2861C25F116BE905002B8514 /* MUCountryServerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MUCountryServerListController.h; sourceTree = "<group>"; };
@@ -592,6 +602,18 @@
name = Preferences;
sourceTree = "<group>";
};
+ 285E2A5F150D7287008AE185 /* Build Configuration */ = {
+ isa = PBXGroup;
+ children = (
+ 285E2A60150D729B008AE185 /* AppStore.xcconfig */,
+ 285E2A61150D729B008AE185 /* Base.xcconfig */,
+ 285E2A62150D729B008AE185 /* BetaDist.xcconfig */,
+ 285E2A63150D729B008AE185 /* Debug.xcconfig */,
+ 285E2A64150D729B008AE185 /* Release.xcconfig */,
+ );
+ name = "Build Configuration";
+ sourceTree = "<group>";
+ };
2861C28C116BE90B002B8514 /* Dependencies */ = {
isa = PBXGroup;
children = (
@@ -840,6 +862,7 @@
28DC1C1213DE59120037CDC2 /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ 285E2A5F150D7287008AE185 /* Build Configuration */,
);
name = CustomTemplate;
sourceTree = "<group>";
@@ -1027,6 +1050,11 @@
287A686814C6FB9F008B1BE7 /* GrayCheckmark@2x.png in Resources */,
28FAA35F14D74C1600F6D711 /* SmallMumbleIcon.png in Resources */,
28FAA36014D74C1600F6D711 /* SmallMumbleIcon@2x.png in Resources */,
+ 285E2A65150D729B008AE185 /* AppStore.xcconfig in Resources */,
+ 285E2A66150D729B008AE185 /* Base.xcconfig in Resources */,
+ 285E2A67150D729B008AE185 /* BetaDist.xcconfig in Resources */,
+ 285E2A68150D729B008AE185 /* Debug.xcconfig in Resources */,
+ 285E2A69150D729B008AE185 /* Release.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1152,194 +1180,52 @@
1D6058940D05DD3E006BFB54 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = "";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Source/Mumble.pch;
- "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
- HEADER_SEARCH_PATHS = (
- "${PROJECT_DIR}/MumbleKit/src/",
- "${PROJECT_DIR}/Dependencies/fmdb/src/",
- "${PROJECT_DIR}/Dependencies/gtm/",
- "${PROJECT_DIR}/Dependencies/MKNumberBadgeView/",
- "${PROJECT_DIR}/Dependencies/plcrashreporter",
- );
- INFOPLIST_FILE = Source/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = (
- "-all_load",
- "-ObjC",
- );
- PRODUCT_NAME = Mumble;
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
- USER_HEADER_SEARCH_PATHS = "";
};
name = Debug;
};
1D6058950D05DD3E006BFB54 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "";
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Source/Mumble.pch;
- "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
- HEADER_SEARCH_PATHS = (
- "${PROJECT_DIR}/MumbleKit/src/",
- "${PROJECT_DIR}/Dependencies/fmdb/src/",
- "${PROJECT_DIR}/Dependencies/gtm/",
- "${PROJECT_DIR}/Dependencies/MKNumberBadgeView/",
- "${PROJECT_DIR}/Dependencies/plcrashreporter",
- );
- INFOPLIST_FILE = Source/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = (
- "-all_load",
- "-ObjC",
- );
- PRODUCT_NAME = Mumble;
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
- USER_HEADER_SEARCH_PATHS = "";
- VALIDATE_PRODUCT = YES;
};
name = Release;
};
2887C8891454C4C2009B3576 /* AppStore */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 285E2A60150D729B008AE185 /* AppStore.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
};
name = AppStore;
};
2887C88A1454C4C2009B3576 /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CODE_SIGN_IDENTITY = "iPhone Distribution: Mikkel Krautz";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Mikkel Krautz";
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "";
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Source/Mumble.pch;
- GCC_PREPROCESSOR_DEFINITIONS = "MUMBLE_APP_STORE=1";
- "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
- HEADER_SEARCH_PATHS = (
- "${PROJECT_DIR}/MumbleKit/src/",
- "${PROJECT_DIR}/Dependencies/fmdb/src/",
- "${PROJECT_DIR}/Dependencies/gtm/",
- "${PROJECT_DIR}/Dependencies/MKNumberBadgeView/",
- "${PROJECT_DIR}/Dependencies/plcrashreporter",
- );
- INFOPLIST_FILE = Source/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = (
- "-all_load",
- "-ObjC",
- );
- PRODUCT_NAME = Mumble;
- PROVISIONING_PROFILE = "B326866D-9225-41D6-8507-A34798324CFE";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "B326866D-9225-41D6-8507-A34798324CFE";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
- USER_HEADER_SEARCH_PATHS = "";
- VALIDATE_PRODUCT = YES;
};
name = AppStore;
};
28BC1E7A1227155500C03FCF /* BetaDist */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 285E2A62150D729B008AE185 /* BetaDist.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
};
name = BetaDist;
};
28BC1E7B1227155500C03FCF /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CODE_SIGN_IDENTITY = "iPhone Distribution";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "";
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Source/Mumble.pch;
- GCC_PREPROCESSOR_DEFINITIONS = "MUMBLE_BETA_DIST=1";
- "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
- HEADER_SEARCH_PATHS = (
- "${PROJECT_DIR}/MumbleKit/src/",
- "${PROJECT_DIR}/Dependencies/fmdb/src/",
- "${PROJECT_DIR}/Dependencies/gtm/",
- "${PROJECT_DIR}/Dependencies/MKNumberBadgeView/",
- "${PROJECT_DIR}/Dependencies/plcrashreporter",
- );
- INFOPLIST_FILE = Source/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = (
- "-all_load",
- "-ObjC",
- );
- PRODUCT_NAME = Mumble;
- PROVISIONING_PROFILE = "";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
- USER_HEADER_SEARCH_PATHS = "";
- VALIDATE_PRODUCT = YES;
};
name = BetaDist;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 285E2A63150D729B008AE185 /* Debug.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 285E2A64150D729B008AE185 /* Release.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
diff --git a/MumbleKit b/MumbleKit
-Subproject 807a5f0ddc2cb69229e281cbd599c7ce2ad8f0f
+Subproject c59cc80c9846e1c73dfa605f4e12675b969558b