Merge 64-bit xcode support from measurement branch.

Copied from Perforce
 Change: 180937
 ServerID: perforce.ravenbrook.com

1 files changed, 8 insertions, 14 deletions

diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 00ed384e6ee..1b5d7700d4b 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -16,7 +16,7 @@
                                 3104AFF6156D37BC000A585A /* PBXTargetDependency */,
                                 3114A6D5156E9839001E0AA3 /* PBXTargetDependency */,
                                 2D07B9791636FCBD00DB751B /* PBXTargetDependency */,
-                                22E16A8916C141020090AD9F /* PBXTargetDependency */,
+                                2275798916C5422900B662B0 /* PBXTargetDependency */,
                                 3114A6B9156E9763001E0AA3 /* PBXTargetDependency */,
                                 3114A6A7156E9739001E0AA3 /* PBXTargetDependency */,
                                 3114A68D156E9686001E0AA3 /* PBXTargetDependency */,
@@ -202,7 +202,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-                22E16A8816C141020090AD9F /* PBXContainerItemProxy */ = {
+                2275798816C5422900B662B0 /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
                         proxyType = 1;
@@ -2192,7 +2192,7 @@
                 31EEABDA156AAE9E00714D05 /* Project object */ = {
                         isa = PBXProject;
                         attributes = {
-                                LastUpgradeCheck = 0460;
+                                LastUpgradeCheck = 0440;
                         };
                         buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */;
                         compatibilityVersion = "Xcode 3.2";
@@ -2593,10 +2593,10 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-                22E16A8916C141020090AD9F /* PBXTargetDependency */ = {
+                2275798916C5422900B662B0 /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
                         target = 2D604B9B16514B1A003AAF46 /* mpseventtxt */;
-                        targetProxy = 22E16A8816C141020090AD9F /* PBXContainerItemProxy */;
+                        targetProxy = 2275798816C5422900B662B0 /* PBXContainerItemProxy */;
                 };
                 2D07B9791636FCBD00DB751B /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
@@ -3001,7 +3001,6 @@
                 3104AFF3156D37A0000A585A /* Debug */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(NATIVE_ARCH_ACTUAL)";
                                 COMBINE_HIDPI_IMAGES = YES;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -3010,7 +3009,6 @@
                 3104AFF4156D37A0000A585A /* Release */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(NATIVE_ARCH_ACTUAL)";
                                 COMBINE_HIDPI_IMAGES = YES;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -3299,10 +3297,9 @@
                 318387EB15DC30CC008E4EA0 /* WE */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                 CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
                                 CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                 GCC_C_LANGUAGE_STANDARD = ansi;
                                 GCC_OPTIMIZATION_LEVEL = 2;
@@ -3353,7 +3350,6 @@
                 318387EC15DC30CC008E4EA0 /* WE */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(NATIVE_ARCH_ACTUAL)";
                                 COMBINE_HIDPI_IMAGES = YES;
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                         };
@@ -3666,10 +3662,9 @@
                 31EEABDF156AAE9E00714D05 /* Debug */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                 CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
                                 CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 COPY_PHASE_STRIP = NO;
                                 GCC_C_LANGUAGE_STANDARD = ansi;
                                 GCC_OPTIMIZATION_LEVEL = 0;
@@ -3721,10 +3716,9 @@
                 31EEABE0156AAE9E00714D05 /* Release */ = {
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                                ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
                                 CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
                                 CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                 GCC_C_LANGUAGE_STANDARD = ansi;
                                 GCC_OPTIMIZATION_LEVEL = 2;