Repair GoogleMock in XCode.

dice-roll.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		CD38F50F21C83936007A732C /* libdice.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD38F50921C83912007A732C /* libdice.dylib */; };
 		CD38F51221C8397A007A732C /* libshared_random_generator.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDED6A6021B2F89900AB91D0 /* libshared_random_generator.dylib */; };
 		CD38F52B21C87771007A732C /* libdice.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD38F50921C83912007A732C /* libdice.dylib */; };
-		CD38F53321C87787007A732C /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD38F51B21C87757007A732C /* GoogleMock.framework */; };
 		CD38F53521C87799007A732C /* dice_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD38F53421C87799007A732C /* dice_test.cxx */; };
 		CD38F53721C89493007A732C /* exception.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD38F53621C89493007A732C /* exception.cxx */; };
 		CD38F53921C922E2007A732C /* roll_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD38F53821C922E2007A732C /* roll_test.cxx */; };
@@ -21,6 +20,7 @@
 		CD38F55721C9482A007A732C /* main.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD38F55621C9482A007A732C /* main.cxx */; };
 		CD38F56221C94872007A732C /* terminal_helper.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD38F54E21C945C2007A732C /* terminal_helper.cxx */; };
 		CD38F56521C94A00007A732C /* libdice.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD38F50921C83912007A732C /* libdice.dylib */; };
+		CDC7489B25312DD6008D9D1D /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDC7489425312DBF008D9D1D /* GoogleMock.framework */; };
 		CDED6A2721B2F28A00AB91D0 /* main.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDED6A2621B2F28A00AB91D0 /* main.cxx */; };
 /* End PBXBuildFile section */
 
@@ -32,55 +32,48 @@
 			remoteGlobalIDString = CD38F50821C83912007A732C;
 			remoteInfo = dice;
 		};
-		CD38F51A21C87757007A732C /* PBXContainerItemProxy */ = {
+		CD38F52C21C87771007A732C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDED6A1B21B2F28A00AB91D0 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = CD38F50821C83912007A732C;
+			remoteInfo = dice;
+		};
+		CD38F56321C949FB007A732C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
+			containerPortal = CDED6A1B21B2F28A00AB91D0 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = CD38F50821C83912007A732C;
+			remoteInfo = dice;
+		};
+		CDC7489325312DBF008D9D1D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 05818F861A685AEA0072A469;
 			remoteInfo = GoogleMock;
 		};
-		CD38F51C21C87757007A732C /* PBXContainerItemProxy */ = {
+		CDC7489525312DBF008D9D1D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
+			containerPortal = CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 05E96ABD1A68600C00204102;
 			remoteInfo = gmock;
 		};
-		CD38F51E21C87757007A732C /* PBXContainerItemProxy */ = {
+		CDC7489725312DBF008D9D1D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
+			containerPortal = CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 05E96B1F1A68634900204102;
 			remoteInfo = gtest;
 		};
-		CD38F52021C87757007A732C /* PBXContainerItemProxy */ = {
+		CDC7489925312DBF008D9D1D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
+			containerPortal = CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 05818F901A685AEA0072A469;
 			remoteInfo = GoogleMockTests;
 		};
-		CD38F52C21C87771007A732C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CDED6A1B21B2F28A00AB91D0 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = CD38F50821C83912007A732C;
-			remoteInfo = dice;
-		};
-		CD38F53121C87783007A732C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 05818F851A685AEA0072A469;
-			remoteInfo = GoogleMock;
-		};
-		CD38F56321C949FB007A732C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CDED6A1B21B2F28A00AB91D0 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = CD38F50821C83912007A732C;
-			remoteInfo = dice;
-		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -106,7 +99,6 @@
 
 /* Begin PBXFileReference section */
 		CD38F50921C83912007A732C /* libdice.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libdice.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		CD38F51321C87757007A732C /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CD38F52621C87771007A732C /* dice-td.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "dice-td.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD38F52A21C87771007A732C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CD38F53421C87799007A732C /* dice_test.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = dice_test.cxx; sourceTree = "<group>"; };
@@ -119,6 +111,7 @@
 		CD38F55621C9482A007A732C /* main.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cxx; sourceTree = "<group>"; };
 		CD8F1ABC21B31E9E00CBB3CA /* roll.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = roll.h; sourceTree = "<group>"; };
 		CD8F1ABD21B31E9E00CBB3CA /* roll.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = roll.cxx; sourceTree = "<group>"; };
+		CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CDED6A2321B2F28A00AB91D0 /* simple_dice */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = simple_dice; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDED6A2621B2F28A00AB91D0 /* main.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cxx; sourceTree = "<group>"; };
 		CDED6A2F21B2F2DC00AB91D0 /* die.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = die.h; sourceTree = "<group>"; };
@@ -141,7 +134,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD38F53321C87787007A732C /* GoogleMock.framework in Frameworks */,
+				CDC7489B25312DD6008D9D1D /* GoogleMock.framework in Frameworks */,
 				CD38F52B21C87771007A732C /* libdice.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -165,17 +158,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		CD38F51421C87757007A732C /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CD38F51B21C87757007A732C /* GoogleMock.framework */,
-				CD38F51D21C87757007A732C /* gmock.framework */,
-				CD38F51F21C87757007A732C /* gtest.framework */,
-				CD38F52121C87757007A732C /* GoogleMockTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		CD38F52721C87771007A732C /* dice-td */ = {
 			isa = PBXGroup;
 			children = (
@@ -200,10 +182,21 @@
 			path = simple_dice;
 			sourceTree = "<group>";
 		};
+		CDC7488D25312DBF008D9D1D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDC7489425312DBF008D9D1D /* GoogleMock.framework */,
+				CDC7489625312DBF008D9D1D /* gmock.framework */,
+				CDC7489825312DBF008D9D1D /* gtest.framework */,
+				CDC7489A25312DBF008D9D1D /* GoogleMockTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		CDED6A1A21B2F28A00AB91D0 = {
 			isa = PBXGroup;
 			children = (
-				CD38F51321C87757007A732C /* GoogleMock.xcodeproj */,
+				CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */,
 				CDED6A2E21B2F2C300AB91D0 /* include */,
 				CDED6A2D21B2F2B200AB91D0 /* test */,
 				CDED6A2521B2F28A00AB91D0 /* src */,
@@ -308,7 +301,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				CD38F53221C87783007A732C /* PBXTargetDependency */,
 				CD38F52D21C87771007A732C /* PBXTargetDependency */,
 			);
 			name = "dice-td";
@@ -388,8 +380,8 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = CD38F51421C87757007A732C /* Products */;
-					ProjectRef = CD38F51321C87757007A732C /* GoogleMock.xcodeproj */;
+					ProductGroup = CDC7488D25312DBF008D9D1D /* Products */;
+					ProjectRef = CDC7488C25312DBF008D9D1D /* GoogleMock.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -403,32 +395,32 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		CD38F51B21C87757007A732C /* GoogleMock.framework */ = {
+		CDC7489425312DBF008D9D1D /* GoogleMock.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
 			path = GoogleMock.framework;
-			remoteRef = CD38F51A21C87757007A732C /* PBXContainerItemProxy */;
+			remoteRef = CDC7489325312DBF008D9D1D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CD38F51D21C87757007A732C /* gmock.framework */ = {
+		CDC7489625312DBF008D9D1D /* gmock.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
 			path = gmock.framework;
-			remoteRef = CD38F51C21C87757007A732C /* PBXContainerItemProxy */;
+			remoteRef = CDC7489525312DBF008D9D1D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CD38F51F21C87757007A732C /* gtest.framework */ = {
+		CDC7489825312DBF008D9D1D /* gtest.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
 			path = gtest.framework;
-			remoteRef = CD38F51E21C87757007A732C /* PBXContainerItemProxy */;
+			remoteRef = CDC7489725312DBF008D9D1D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CD38F52121C87757007A732C /* GoogleMockTests.xctest */ = {
+		CDC7489A25312DBF008D9D1D /* GoogleMockTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
 			path = GoogleMockTests.xctest;
-			remoteRef = CD38F52021C87757007A732C /* PBXContainerItemProxy */;
+			remoteRef = CDC7489925312DBF008D9D1D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -495,11 +487,6 @@
 			target = CD38F50821C83912007A732C /* dice */;
 			targetProxy = CD38F52C21C87771007A732C /* PBXContainerItemProxy */;
 		};
-		CD38F53221C87783007A732C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = GoogleMock;
-			targetProxy = CD38F53121C87783007A732C /* PBXContainerItemProxy */;
-		};
 		CD38F56421C949FB007A732C /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = CD38F50821C83912007A732C /* dice */;