xcode

1 files changed, 20 insertions, 30 deletions

diff --git a/moses-cmd/moses-cmd.xcodeproj/project.pbxproj b/moses-cmd/moses-cmd.xcodeproj/project.pbxproj
index 8fb7c5e04..47f6ddef7 100644
--- a/moses-cmd/moses-cmd.xcodeproj/project.pbxproj
+++ b/moses-cmd/moses-cmd.xcodeproj/project.pbxproj
@@ -14,7 +14,7 @@
 		1C8CFF4F0AD68D3600FA22E2 /* TranslationAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8CFF470AD68D3600FA22E2 /* TranslationAnalysis.cpp */; };
 		1C8CFF500AD68D3600FA22E2 /* TranslationAnalysis.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C8CFF480AD68D3600FA22E2 /* TranslationAnalysis.h */; };
 		1CE646E411679F6900EC77CC /* libOnDiskPt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CE646E311679F5F00EC77CC /* libOnDiskPt.a */; };
-		1EBB175F126C16B800AE6102 /* libkenlm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EBB175A126C169000AE6102 /* libkenlm.a */; };
+		1EE8C2DD1476A3F2002496F2 /* libutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EE8C2DC1476A34A002496F2 /* libutil.a */; };
 		B219B8540E93812700EAB407 /* libmoses.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03306D670C0B240B00CA1311 /* libmoses.a */; };
 		B219B8580E9381AC00EAB407 /* IOWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B219B8560E9381AC00EAB407 /* IOWrapper.cpp */; };
 		B28B1ED3110F52BB00AAD188 /* LatticeMBR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B28B1ED2110F52BB00AAD188 /* LatticeMBR.cpp */; };
@@ -49,19 +49,12 @@
 			remoteGlobalIDString = D2AAC045055464E500DB518D;
 			remoteInfo = OnDiskPt;
 		};
-		1EBB1759126C169000AE6102 /* PBXContainerItemProxy */ = {
+		1EE8C2DB1476A34A002496F2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 1EBB1752126C169000AE6102 /* kenlm.xcodeproj */;
+			containerPortal = 1EE8C2D41476A34A002496F2 /* util.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = D2AAC046055464E500DB518D;
-			remoteInfo = kenlm;
-		};
-		1ED0E9661277CFC500AC18B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1EBB1752126C169000AE6102 /* kenlm.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = D2AAC045055464E500DB518D;
-			remoteInfo = kenlm;
+			remoteGlobalIDString = 1EE8C2711476A262002496F2;
+			remoteInfo = util;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -89,7 +82,7 @@
 		1C8CFF470AD68D3600FA22E2 /* TranslationAnalysis.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = TranslationAnalysis.cpp; path = src/TranslationAnalysis.cpp; sourceTree = "<group>"; };
 		1C8CFF480AD68D3600FA22E2 /* TranslationAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TranslationAnalysis.h; path = src/TranslationAnalysis.h; sourceTree = "<group>"; };
 		1CE646DB11679F5F00EC77CC /* OnDiskPt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OnDiskPt.xcodeproj; path = ../OnDiskPt/OnDiskPt.xcodeproj; sourceTree = SOURCE_ROOT; };
-		1EBB1752126C169000AE6102 /* kenlm.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = kenlm.xcodeproj; path = ../kenlm/kenlm.xcodeproj; sourceTree = SOURCE_ROOT; };
+		1EE8C2D41476A34A002496F2 /* util.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = util.xcodeproj; path = ../util/util.xcodeproj; sourceTree = "<group>"; };
 		8DD76F6C0486A84900D96B5E /* moses-cmd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "moses-cmd"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B219B8560E9381AC00EAB407 /* IOWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOWrapper.cpp; path = src/IOWrapper.cpp; sourceTree = "<group>"; };
 		B219B8570E9381AC00EAB407 /* IOWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOWrapper.h; path = src/IOWrapper.h; sourceTree = "<group>"; };
@@ -102,7 +95,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1EBB175F126C16B800AE6102 /* libkenlm.a in Frameworks */,
+				1EE8C2DD1476A3F2002496F2 /* libutil.a in Frameworks */,
 				1CE646E411679F6900EC77CC /* libOnDiskPt.a in Frameworks */,
 				B219B8540E93812700EAB407 /* libmoses.a in Frameworks */,
 			);
@@ -122,7 +115,7 @@
 		08FB7794FE84155DC02AAC07 /* moses-cmd */ = {
 			isa = PBXGroup;
 			children = (
-				1EBB1752126C169000AE6102 /* kenlm.xcodeproj */,
+				1EE8C2D41476A34A002496F2 /* util.xcodeproj */,
 				1CE646DB11679F5F00EC77CC /* OnDiskPt.xcodeproj */,
 				03306D5F0C0B240B00CA1311 /* moses.xcodeproj */,
 				08FB7795FE84155DC02AAC07 /* Source */,
@@ -165,10 +158,10 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		1EBB1753126C169000AE6102 /* Products */ = {
+		1EE8C2D51476A34A002496F2 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1EBB175A126C169000AE6102 /* libkenlm.a */,
+				1EE8C2DC1476A34A002496F2 /* libutil.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -196,7 +189,6 @@
 			dependencies = (
 				03306D780C0B244800CA1311 /* PBXTargetDependency */,
 				1CE6472E1167A11600EC77CC /* PBXTargetDependency */,
-				1ED0E9671277CFC500AC18B1 /* PBXTargetDependency */,
 			);
 			name = "moses-cmd";
 			productInstallPath = "$(HOME)/bin";
@@ -223,10 +215,6 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = 1EBB1753126C169000AE6102 /* Products */;
-					ProjectRef = 1EBB1752126C169000AE6102 /* kenlm.xcodeproj */;
-				},
-				{
 					ProductGroup = 03306D600C0B240B00CA1311 /* Products */;
 					ProjectRef = 03306D5F0C0B240B00CA1311 /* moses.xcodeproj */;
 				},
@@ -234,6 +222,10 @@
 					ProductGroup = 1CE646DC11679F5F00EC77CC /* Products */;
 					ProjectRef = 1CE646DB11679F5F00EC77CC /* OnDiskPt.xcodeproj */;
 				},
+				{
+					ProductGroup = 1EE8C2D51476A34A002496F2 /* Products */;
+					ProjectRef = 1EE8C2D41476A34A002496F2 /* util.xcodeproj */;
+				},
 			);
 			projectRoot = "";
 			targets = (
@@ -257,11 +249,11 @@
 			remoteRef = 1CE646E211679F5F00EC77CC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		1EBB175A126C169000AE6102 /* libkenlm.a */ = {
+		1EE8C2DC1476A34A002496F2 /* libutil.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = libkenlm.a;
-			remoteRef = 1EBB1759126C169000AE6102 /* PBXContainerItemProxy */;
+			path = libutil.a;
+			remoteRef = 1EE8C2DB1476A34A002496F2 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -292,11 +284,6 @@
 			name = OnDiskPt;
 			targetProxy = 1CE6472D1167A11600EC77CC /* PBXContainerItemProxy */;
 		};
-		1ED0E9671277CFC500AC18B1 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = kenlm;
-			targetProxy = 1ED0E9661277CFC500AC18B1 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -317,6 +304,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
+					../,
 					../moses/src,
 					../kenlm,
 					/opt/local/include,
@@ -357,6 +345,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
+					../,
 					../moses/src,
 					../kenlm,
 					/opt/local/include,
@@ -389,6 +378,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
+					../,
 					../moses/src,
 					../kenlm,
 					/opt/local/include,