diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj
index f9799f5fb8..e518de1d24 100644
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@@ -7,37 +7,37 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		670F29631BA9D3C200F2ABF4 /* angle_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29221BA9D2E700F2ABF4 /* angle_test.cpp */; };
-		670F29641BA9D3C200F2ABF4 /* anyrect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */; };
-		670F29651BA9D3C200F2ABF4 /* cellid_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29241BA9D2E700F2ABF4 /* cellid_test.cpp */; };
-		670F29661BA9D3C200F2ABF4 /* common_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29251BA9D2E700F2ABF4 /* common_test.cpp */; };
-		670F29671BA9D3C200F2ABF4 /* covering_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29261BA9D2E700F2ABF4 /* covering_test.cpp */; };
-		670F29681BA9D3C200F2ABF4 /* distance_on_sphere_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29271BA9D2E700F2ABF4 /* distance_on_sphere_test.cpp */; };
-		670F29691BA9D3C200F2ABF4 /* distance_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29281BA9D2E700F2ABF4 /* distance_test.cpp */; };
 		670F296A1BA9D3C200F2ABF4 /* equality.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29291BA9D2E700F2ABF4 /* equality.hpp */; };
-		670F296B1BA9D3C200F2ABF4 /* intersect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292A1BA9D2E700F2ABF4 /* intersect_test.cpp */; };
 		670F296C1BA9D3C200F2ABF4 /* large_polygon.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292B1BA9D2E700F2ABF4 /* large_polygon.hpp */; };
-		670F296D1BA9D3C200F2ABF4 /* latlon_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292C1BA9D2E700F2ABF4 /* latlon_test.cpp */; };
-		670F296E1BA9D3C200F2ABF4 /* packer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292D1BA9D2E700F2ABF4 /* packer_test.cpp */; };
-		670F296F1BA9D3C200F2ABF4 /* point_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292E1BA9D2E700F2ABF4 /* point_test.cpp */; };
-		670F29701BA9D3C200F2ABF4 /* pointu_to_uint64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292F1BA9D2E700F2ABF4 /* pointu_to_uint64_test.cpp */; };
-		670F29711BA9D3C200F2ABF4 /* polygon_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29301BA9D2E700F2ABF4 /* polygon_test.cpp */; };
-		670F29721BA9D3C200F2ABF4 /* rect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29311BA9D2E700F2ABF4 /* rect_test.cpp */; };
-		670F29731BA9D3C200F2ABF4 /* region_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29321BA9D2E700F2ABF4 /* region_test.cpp */; };
-		670F29741BA9D3C200F2ABF4 /* region2d_binary_op_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29331BA9D2E700F2ABF4 /* region2d_binary_op_test.cpp */; };
-		670F29751BA9D3C200F2ABF4 /* robust_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29341BA9D2E700F2ABF4 /* robust_test.cpp */; };
-		670F29761BA9D3C200F2ABF4 /* screen_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29351BA9D2E700F2ABF4 /* screen_test.cpp */; };
-		670F29771BA9D3C200F2ABF4 /* segments_intersect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29361BA9D2E700F2ABF4 /* segments_intersect_test.cpp */; };
-		670F29781BA9D3C200F2ABF4 /* simplification_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29371BA9D2E700F2ABF4 /* simplification_test.cpp */; };
-		670F29791BA9D3C200F2ABF4 /* spline_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29381BA9D2E700F2ABF4 /* spline_test.cpp */; };
 		670F297A1BA9D3C200F2ABF4 /* test_regions.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29391BA9D2E700F2ABF4 /* test_regions.hpp */; };
-		670F297B1BA9D3C200F2ABF4 /* transformations_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293A1BA9D2E700F2ABF4 /* transformations_test.cpp */; };
-		670F297C1BA9D3C200F2ABF4 /* tree_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293B1BA9D2E700F2ABF4 /* tree_test.cpp */; };
-		670F297D1BA9D3C200F2ABF4 /* vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */; };
 		670F29801BA9D42E00F2ABF4 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */; };
 		670F29831BA9D46F00F2ABF4 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F29811BA9D46F00F2ABF4 /* libbase.a */; };
 		670F29841BA9D46F00F2ABF4 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670F29821BA9D46F00F2ABF4 /* libindexer.a */; };
 		670F29851BA9D47300F2ABF4 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675344911A3F684600A0A8C3 /* libgeometry.a */; };
+		670F29871BAABDA600F2ABF4 /* angle_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29221BA9D2E700F2ABF4 /* angle_test.cpp */; };
+		670F29881BAABDA600F2ABF4 /* anyrect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */; };
+		670F29891BAABDA600F2ABF4 /* cellid_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29241BA9D2E700F2ABF4 /* cellid_test.cpp */; };
+		670F298A1BAABDA600F2ABF4 /* common_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29251BA9D2E700F2ABF4 /* common_test.cpp */; };
+		670F298B1BAABDA600F2ABF4 /* covering_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29261BA9D2E700F2ABF4 /* covering_test.cpp */; };
+		670F298C1BAABDA600F2ABF4 /* distance_on_sphere_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29271BA9D2E700F2ABF4 /* distance_on_sphere_test.cpp */; };
+		670F298D1BAABDA600F2ABF4 /* distance_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29281BA9D2E700F2ABF4 /* distance_test.cpp */; };
+		670F298E1BAABDA600F2ABF4 /* intersect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292A1BA9D2E700F2ABF4 /* intersect_test.cpp */; };
+		670F298F1BAABDA600F2ABF4 /* latlon_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292C1BA9D2E700F2ABF4 /* latlon_test.cpp */; };
+		670F29901BAABDA600F2ABF4 /* packer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292D1BA9D2E700F2ABF4 /* packer_test.cpp */; };
+		670F29911BAABDA600F2ABF4 /* point_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292E1BA9D2E700F2ABF4 /* point_test.cpp */; };
+		670F29921BAABDA600F2ABF4 /* pointu_to_uint64_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292F1BA9D2E700F2ABF4 /* pointu_to_uint64_test.cpp */; };
+		670F29931BAABDA600F2ABF4 /* polygon_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29301BA9D2E700F2ABF4 /* polygon_test.cpp */; };
+		670F29941BAABDA600F2ABF4 /* rect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29311BA9D2E700F2ABF4 /* rect_test.cpp */; };
+		670F29951BAABDA600F2ABF4 /* region_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29321BA9D2E700F2ABF4 /* region_test.cpp */; };
+		670F29961BAABDA600F2ABF4 /* region2d_binary_op_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29331BA9D2E700F2ABF4 /* region2d_binary_op_test.cpp */; };
+		670F29971BAABDA600F2ABF4 /* robust_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29341BA9D2E700F2ABF4 /* robust_test.cpp */; };
+		670F29981BAABDA600F2ABF4 /* screen_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29351BA9D2E700F2ABF4 /* screen_test.cpp */; };
+		670F29991BAABDA600F2ABF4 /* segments_intersect_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29361BA9D2E700F2ABF4 /* segments_intersect_test.cpp */; };
+		670F299A1BAABDA600F2ABF4 /* simplification_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29371BA9D2E700F2ABF4 /* simplification_test.cpp */; };
+		670F299B1BAABDA600F2ABF4 /* spline_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29381BA9D2E700F2ABF4 /* spline_test.cpp */; };
+		670F299C1BAABDA600F2ABF4 /* transformations_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293A1BA9D2E700F2ABF4 /* transformations_test.cpp */; };
+		670F299D1BAABDA600F2ABF4 /* tree_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293B1BA9D2E700F2ABF4 /* tree_test.cpp */; };
+		670F299E1BAABDA600F2ABF4 /* vector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */; };
 		675344BC1A3F687400A0A8C3 /* angles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753449F1A3F687400A0A8C3 /* angles.cpp */; };
 		675344BD1A3F687400A0A8C3 /* angles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344A01A3F687400A0A8C3 /* angles.hpp */; };
 		675344BE1A3F687400A0A8C3 /* any_rect2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675344A11A3F687400A0A8C3 /* any_rect2d.hpp */; };
@@ -174,6 +174,7 @@
 		670F29211BA9D25D00F2ABF4 /* geometry_tests */ = {
 			isa = PBXGroup;
 			children = (
+				670F299F1BAAC61C00F2ABF4 /* libs */,
 				670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */,
 				670F29221BA9D2E700F2ABF4 /* angle_test.cpp */,
 				670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */,
@@ -207,11 +208,18 @@
 			path = ../../geometry/geometry_tests;
 			sourceTree = "<group>";
 		};
-		675344881A3F684600A0A8C3 = {
+		670F299F1BAAC61C00F2ABF4 /* libs */ = {
 			isa = PBXGroup;
 			children = (
 				670F29811BA9D46F00F2ABF4 /* libbase.a */,
 				670F29821BA9D46F00F2ABF4 /* libindexer.a */,
+			);
+			name = libs;
+			sourceTree = "<group>";
+		};
+		675344881A3F684600A0A8C3 = {
+			isa = PBXGroup;
+			children = (
 				670D05A51B0E01FF0013A7AC /* defaults.xcconfig */,
 				670F29211BA9D25D00F2ABF4 /* geometry_tests */,
 				675344931A3F684600A0A8C3 /* geometry */,
@@ -386,34 +394,34 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				670F29631BA9D3C200F2ABF4 /* angle_test.cpp in Sources */,
-				670F29641BA9D3C200F2ABF4 /* anyrect_test.cpp in Sources */,
-				670F29651BA9D3C200F2ABF4 /* cellid_test.cpp in Sources */,
-				670F29661BA9D3C200F2ABF4 /* common_test.cpp in Sources */,
-				670F29671BA9D3C200F2ABF4 /* covering_test.cpp in Sources */,
-				670F29681BA9D3C200F2ABF4 /* distance_on_sphere_test.cpp in Sources */,
-				670F29691BA9D3C200F2ABF4 /* distance_test.cpp in Sources */,
+				670F29911BAABDA600F2ABF4 /* point_test.cpp in Sources */,
+				670F29941BAABDA600F2ABF4 /* rect_test.cpp in Sources */,
+				670F299A1BAABDA600F2ABF4 /* simplification_test.cpp in Sources */,
+				670F298A1BAABDA600F2ABF4 /* common_test.cpp in Sources */,
+				670F298D1BAABDA600F2ABF4 /* distance_test.cpp in Sources */,
+				670F299B1BAABDA600F2ABF4 /* spline_test.cpp in Sources */,
+				670F299C1BAABDA600F2ABF4 /* transformations_test.cpp in Sources */,
+				670F29951BAABDA600F2ABF4 /* region_test.cpp in Sources */,
+				670F29921BAABDA600F2ABF4 /* pointu_to_uint64_test.cpp in Sources */,
+				670F29891BAABDA600F2ABF4 /* cellid_test.cpp in Sources */,
+				670F29961BAABDA600F2ABF4 /* region2d_binary_op_test.cpp in Sources */,
+				670F299D1BAABDA600F2ABF4 /* tree_test.cpp in Sources */,
+				670F29871BAABDA600F2ABF4 /* angle_test.cpp in Sources */,
+				670F29991BAABDA600F2ABF4 /* segments_intersect_test.cpp in Sources */,
+				670F299E1BAABDA600F2ABF4 /* vector_test.cpp in Sources */,
 				670F296A1BA9D3C200F2ABF4 /* equality.hpp in Sources */,
-				670F296B1BA9D3C200F2ABF4 /* intersect_test.cpp in Sources */,
 				670F296C1BA9D3C200F2ABF4 /* large_polygon.hpp in Sources */,
-				670F296D1BA9D3C200F2ABF4 /* latlon_test.cpp in Sources */,
-				670F296E1BA9D3C200F2ABF4 /* packer_test.cpp in Sources */,
-				670F296F1BA9D3C200F2ABF4 /* point_test.cpp in Sources */,
-				670F29701BA9D3C200F2ABF4 /* pointu_to_uint64_test.cpp in Sources */,
-				670F29711BA9D3C200F2ABF4 /* polygon_test.cpp in Sources */,
-				670F29721BA9D3C200F2ABF4 /* rect_test.cpp in Sources */,
-				670F29731BA9D3C200F2ABF4 /* region_test.cpp in Sources */,
-				670F29741BA9D3C200F2ABF4 /* region2d_binary_op_test.cpp in Sources */,
-				670F29751BA9D3C200F2ABF4 /* robust_test.cpp in Sources */,
-				670F29761BA9D3C200F2ABF4 /* screen_test.cpp in Sources */,
-				670F29771BA9D3C200F2ABF4 /* segments_intersect_test.cpp in Sources */,
-				670F29781BA9D3C200F2ABF4 /* simplification_test.cpp in Sources */,
-				670F29791BA9D3C200F2ABF4 /* spline_test.cpp in Sources */,
+				670F29981BAABDA600F2ABF4 /* screen_test.cpp in Sources */,
 				670F29801BA9D42E00F2ABF4 /* testingmain.cpp in Sources */,
+				670F298E1BAABDA600F2ABF4 /* intersect_test.cpp in Sources */,
+				670F29881BAABDA600F2ABF4 /* anyrect_test.cpp in Sources */,
+				670F29971BAABDA600F2ABF4 /* robust_test.cpp in Sources */,
+				670F29901BAABDA600F2ABF4 /* packer_test.cpp in Sources */,
+				670F298F1BAABDA600F2ABF4 /* latlon_test.cpp in Sources */,
+				670F298B1BAABDA600F2ABF4 /* covering_test.cpp in Sources */,
+				670F29931BAABDA600F2ABF4 /* polygon_test.cpp in Sources */,
+				670F298C1BAABDA600F2ABF4 /* distance_on_sphere_test.cpp in Sources */,
 				670F297A1BA9D3C200F2ABF4 /* test_regions.hpp in Sources */,
-				670F297B1BA9D3C200F2ABF4 /* transformations_test.cpp in Sources */,
-				670F297C1BA9D3C200F2ABF4 /* tree_test.cpp in Sources */,
-				670F297D1BA9D3C200F2ABF4 /* vector_test.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -573,6 +581,7 @@
 				670F29621BA9D39A00F2ABF4 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		6753448C1A3F684600A0A8C3 /* Build configuration list for PBXProject "geometry" */ = {
 			isa = XCConfigurationList;