Index: base/base.xcodeproj/project.pbxproj |
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj |
index 02cef59cee68c4aecd2384889c051f7d1424de33..adb444ac48a489025a49496eeef75b340e486164 100644 |
--- a/base/base.xcodeproj/project.pbxproj |
+++ b/base/base.xcodeproj/project.pbxproj |
@@ -40,6 +40,7 @@ |
4D11B59C0E91730500EF7617 /* rand_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5970E9172F800EF7617 /* rand_util_unittest.cc */; }; |
4D11B89E0E929F0400EF7617 /* file_path.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89B0E929EFF00EF7617 /* file_path.cc */; }; |
4D11B89F0E929F0700EF7617 /* file_path_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89D0E929EFF00EF7617 /* file_path_unittest.cc */; }; |
+ 531CBD4F0ECB69180084F32D /* libdmg_fp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 531CBD370ECB67090084F32D /* libdmg_fp.a */; }; |
7B26302F0E82F218001CE27F /* message_pump_libevent.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */; }; |
7B2630330E82F258001CE27F /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B2630240E82F1E6001CE27F /* libevent.a */; }; |
7B4C5F4A0E4B6BF900679E8F /* sys_string_conversions_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C5F480E4B6BF900679E8F /* sys_string_conversions_mac.mm */; }; |
@@ -191,6 +192,20 @@ |
/* End PBXBuildFile section */ |
/* Begin PBXContainerItemProxy section */ |
+ 531CBD360ECB67090084F32D /* PBXContainerItemProxy */ = { |
+ isa = PBXContainerItemProxy; |
+ containerPortal = 531CBD320ECB67090084F32D /* dmg_fp.xcodeproj */; |
+ proxyType = 2; |
+ remoteGlobalIDString = D2AAC046055464E500DB518D /* libdmg_fp.a */; |
+ remoteInfo = dmg_fp; |
+ }; |
+ 531CBE300ECB86E90084F32D /* PBXContainerItemProxy */ = { |
+ isa = PBXContainerItemProxy; |
+ containerPortal = 531CBD320ECB67090084F32D /* dmg_fp.xcodeproj */; |
+ proxyType = 1; |
+ remoteGlobalIDString = D2AAC045055464E500DB518D /* dmg_fp */; |
+ remoteInfo = dmg_fp; |
+ }; |
7B165D2F0E55081000185273 /* PBXContainerItemProxy */ = { |
isa = PBXContainerItemProxy; |
containerPortal = E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */; |
@@ -384,6 +399,7 @@ |
4D11B89C0E929EFF00EF7617 /* file_path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file_path.h; sourceTree = "<group>"; }; |
4D11B89D0E929EFF00EF7617 /* file_path_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_path_unittest.cc; sourceTree = "<group>"; }; |
4D7BF2B20E9D3CDC009A6919 /* foundation_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = foundation_utils_mac.h; sourceTree = "<group>"; }; |
+ 531CBD320ECB67090084F32D /* dmg_fp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dmg_fp.xcodeproj; path = third_party/dmg_fp/dmg_fp.xcodeproj; sourceTree = "<group>"; }; |
7B1435DE0E78416400901940 /* skia_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils_mac.h; sourceTree = "<group>"; }; |
7B1435DF0E78419700901940 /* native_widget_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = native_widget_types.h; sourceTree = "<group>"; }; |
7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = third_party/libevent/libevent.xcodeproj; sourceTree = "<group>"; }; |
@@ -713,6 +729,7 @@ |
7B78D40E0E54FE8000609465 /* Foundation.framework in Frameworks */, |
7B78D38C0E54FDEC00609465 /* libbase.a in Frameworks */, |
7B8505D90E5B445100730B43 /* libbase_gfx.a in Frameworks */, |
+ 531CBD4F0ECB69180084F32D /* libdmg_fp.a in Frameworks */, |
7B2630330E82F258001CE27F /* libevent.a in Frameworks */, |
7B836AE30E5509A900F6AD31 /* libgtest.a in Frameworks */, |
7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */, |
@@ -727,6 +744,14 @@ |
/* End PBXFrameworksBuildPhase section */ |
/* Begin PBXGroup section */ |
+ 531CBD330ECB67090084F32D /* Products */ = { |
+ isa = PBXGroup; |
+ children = ( |
+ 531CBD370ECB67090084F32D /* libdmg_fp.a */, |
+ ); |
+ name = Products; |
+ sourceTree = "<group>"; |
+ }; |
7B165D2C0E55081000185273 /* Products */ = { |
isa = PBXGroup; |
children = ( |
@@ -784,6 +809,7 @@ |
7B78D40F0E54FE8D00609465 /* Projects */ = { |
isa = PBXGroup; |
children = ( |
+ 531CBD320ECB67090084F32D /* dmg_fp.xcodeproj */, |
E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */, |
E4562AF30E27E428005E4685 /* icu.xcodeproj */, |
7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */, |
@@ -1196,6 +1222,7 @@ |
dependencies = ( |
7B78D38B0E54FDDE00609465 /* PBXTargetDependency */, |
7B8505D80E5B444100730B43 /* PBXTargetDependency */, |
+ 531CBE310ECB86E90084F32D /* PBXTargetDependency */, |
7B836AD60E55094000F6AD31 /* PBXTargetDependency */, |
7B836ADC0E55094000F6AD31 /* PBXTargetDependency */, |
7B836AD80E55094000F6AD31 /* PBXTargetDependency */, |
@@ -1223,6 +1250,10 @@ |
projectDirPath = ""; |
projectReferences = ( |
{ |
+ ProductGroup = 531CBD330ECB67090084F32D /* Products */; |
+ ProjectRef = 531CBD320ECB67090084F32D /* dmg_fp.xcodeproj */; |
+ }, |
+ { |
ProductGroup = 7B165D2C0E55081000185273 /* Products */; |
ProjectRef = E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */; |
}, |
@@ -1259,6 +1290,13 @@ |
/* End PBXProject section */ |
/* Begin PBXReferenceProxy section */ |
+ 531CBD370ECB67090084F32D /* libdmg_fp.a */ = { |
+ isa = PBXReferenceProxy; |
+ fileType = archive.ar; |
+ path = libdmg_fp.a; |
+ remoteRef = 531CBD360ECB67090084F32D /* PBXContainerItemProxy */; |
+ sourceTree = BUILT_PRODUCTS_DIR; |
+ }; |
7B165D300E55081000185273 /* libgtest.a */ = { |
isa = PBXReferenceProxy; |
fileType = archive.ar; |
@@ -1541,6 +1579,11 @@ |
/* End PBXSourcesBuildPhase section */ |
/* Begin PBXTargetDependency section */ |
+ 531CBE310ECB86E90084F32D /* PBXTargetDependency */ = { |
+ isa = PBXTargetDependency; |
+ name = dmg_fp; |
+ targetProxy = 531CBE300ECB86E90084F32D /* PBXContainerItemProxy */; |
+ }; |
7B2630260E82F1EF001CE27F /* PBXTargetDependency */ = { |
isa = PBXTargetDependency; |
name = libevent; |