| Index: base/base.xcodeproj/project.pbxproj
|
| ===================================================================
|
| --- base/base.xcodeproj/project.pbxproj (revision 2375)
|
| +++ base/base.xcodeproj/project.pbxproj (working copy)
|
| @@ -35,6 +35,8 @@
|
| /* End PBXAggregateTarget section */
|
|
|
| /* Begin PBXBuildFile section */
|
| + 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.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C5F480E4B6BF900679E8F /* sys_string_conversions_mac.cc */; };
|
| 7B4DF5350E5B6A66004D7619 /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B4DF5320E5B6A4B004D7619 /* libskia.a */; };
|
| 7B6AF6340E80211C00F9F9CF /* sys_info_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B6AF6320E80211700F9F9CF /* sys_info_posix.cc */; };
|
| @@ -231,6 +233,20 @@
|
| remoteGlobalIDString = D2AAC046055464E500DB518D;
|
| remoteInfo = zlib;
|
| };
|
| + 7B2630230E82F1E6001CE27F /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */;
|
| + proxyType = 2;
|
| + remoteGlobalIDString = 7B262E840E82E5D7001CE27F /* libevent.a */;
|
| + remoteInfo = libevent;
|
| + };
|
| + 7B2630250E82F1EF001CE27F /* PBXContainerItemProxy */ = {
|
| + isa = PBXContainerItemProxy;
|
| + containerPortal = 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */;
|
| + proxyType = 1;
|
| + remoteGlobalIDString = 7B262E830E82E5D7001CE27F /* libevent */;
|
| + remoteInfo = libevent;
|
| + };
|
| 7B4DF5310E5B6A4B004D7619 /* PBXContainerItemProxy */ = {
|
| isa = PBXContainerItemProxy;
|
| containerPortal = 829E30D60DBFD8ED00819EBF /* skia.xcodeproj */;
|
| @@ -341,6 +357,9 @@
|
| /* Begin PBXFileReference section */
|
| 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>"; };
|
| + 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message_pump_libevent.cc; sourceTree = "<group>"; };
|
| + 7B26302E0E82F218001CE27F /* message_pump_libevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = message_pump_libevent.h; sourceTree = "<group>"; };
|
| 7B4C5D880E4915D800679E8F /* float_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = float_util.h; sourceTree = "<group>"; };
|
| 7B4C5F470E4B6BF900679E8F /* sys_string_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sys_string_conversions.h; sourceTree = "<group>"; };
|
| 7B4C5F480E4B6BF900679E8F /* sys_string_conversions_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sys_string_conversions_mac.cc; sourceTree = "<group>"; };
|
| @@ -645,6 +664,7 @@
|
| 7B78D40E0E54FE8000609465 /* Foundation.framework in Frameworks */,
|
| 7B78D38C0E54FDEC00609465 /* libbase.a in Frameworks */,
|
| 7B8505D90E5B445100730B43 /* libbase_gfx.a in Frameworks */,
|
| + 7B2630330E82F258001CE27F /* libevent.a in Frameworks */,
|
| 7B836AE30E5509A900F6AD31 /* libgtest.a in Frameworks */,
|
| 7B836E180E55CE5B00F6AD31 /* libicudata.a in Frameworks */,
|
| 7B836ADE0E55097000F6AD31 /* libicui18n.a in Frameworks */,
|
| @@ -696,6 +716,14 @@
|
| name = Products;
|
| sourceTree = "<group>";
|
| };
|
| + 7B2630200E82F1E6001CE27F /* Products */ = {
|
| + isa = PBXGroup;
|
| + children = (
|
| + 7B2630240E82F1E6001CE27F /* libevent.a */,
|
| + );
|
| + name = Products;
|
| + sourceTree = "<group>";
|
| + };
|
| 7B4DF52E0E5B6A4B004D7619 /* Products */ = {
|
| isa = PBXGroup;
|
| children = (
|
| @@ -709,6 +737,7 @@
|
| children = (
|
| E45A2C680E47AEFF00DB1196 /* gtest.xcodeproj */,
|
| E4562AF30E27E428005E4685 /* icu.xcodeproj */,
|
| + 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */,
|
| E4562A2A0E27CA2F005E4685 /* libpng.xcodeproj */,
|
| 829E30D60DBFD8ED00819EBF /* skia.xcodeproj */,
|
| E4562A3B0E27CAB6005E4685 /* zlib.xcodeproj */,
|
| @@ -839,6 +868,8 @@
|
| 93611ADB0E5A7FC500F9405D /* message_pump.h */,
|
| 93611ADC0E5A7FC500F9405D /* message_pump_default.cc */,
|
| 93611ADD0E5A7FC500F9405D /* message_pump_default.h */,
|
| + 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */,
|
| + 7B26302E0E82F218001CE27F /* message_pump_libevent.h */,
|
| 7BF8828F0E719389000BAF8A /* non_thread_safe.cc */,
|
| 7BF882900E719389000BAF8A /* non_thread_safe.h */,
|
| 825403390D92D2210006B936 /* observer_list.h */,
|
| @@ -1092,6 +1123,7 @@
|
| 7B836ADC0E55094000F6AD31 /* PBXTargetDependency */,
|
| 7B836AD80E55094000F6AD31 /* PBXTargetDependency */,
|
| 7B836ADA0E55094000F6AD31 /* PBXTargetDependency */,
|
| + 7B2630260E82F1EF001CE27F /* PBXTargetDependency */,
|
| 7B8506290E5B556100730B43 /* PBXTargetDependency */,
|
| 7B4DF5340E5B6A58004D7619 /* PBXTargetDependency */,
|
| 7B8506310E5B55A200730B43 /* PBXTargetDependency */,
|
| @@ -1122,6 +1154,10 @@
|
| ProjectRef = E4562AF30E27E428005E4685 /* icu.xcodeproj */;
|
| },
|
| {
|
| + ProductGroup = 7B2630200E82F1E6001CE27F /* Products */;
|
| + ProjectRef = 7B26301F0E82F1E6001CE27F /* libevent.xcodeproj */;
|
| + },
|
| + {
|
| ProductGroup = 7B165D5A0E55081400185273 /* Products */;
|
| ProjectRef = E4562A2A0E27CA2F005E4685 /* libpng.xcodeproj */;
|
| },
|
| @@ -1209,6 +1245,13 @@
|
| remoteRef = 7B165D6D0E55081400185273 /* PBXContainerItemProxy */;
|
| sourceTree = BUILT_PRODUCTS_DIR;
|
| };
|
| + 7B2630240E82F1E6001CE27F /* libevent.a */ = {
|
| + isa = PBXReferenceProxy;
|
| + fileType = archive.ar;
|
| + path = libevent.a;
|
| + remoteRef = 7B2630230E82F1E6001CE27F /* PBXContainerItemProxy */;
|
| + sourceTree = BUILT_PRODUCTS_DIR;
|
| + };
|
| 7B4DF5320E5B6A4B004D7619 /* libskia.a */ = {
|
| isa = PBXReferenceProxy;
|
| fileType = archive.ar;
|
| @@ -1273,6 +1316,7 @@
|
| ABF4B9B20DC2BC8300A6E319 /* memory_debug.cc in Sources */,
|
| 93611AE10E5A7FE200F9405D /* message_loop.cc in Sources */,
|
| 93611ADF0E5A7FC500F9405D /* message_pump_default.cc in Sources */,
|
| + 7B26302F0E82F218001CE27F /* message_pump_libevent.cc in Sources */,
|
| 7BF882910E719389000BAF8A /* non_thread_safe.cc in Sources */,
|
| ABF4B9B50DC2BC9F00A6E319 /* path_service.cc in Sources */,
|
| 824654A60DC25CD7007C2BAA /* pickle.cc in Sources */,
|
| @@ -1385,6 +1429,11 @@
|
| /* End PBXSourcesBuildPhase section */
|
|
|
| /* Begin PBXTargetDependency section */
|
| + 7B2630260E82F1EF001CE27F /* PBXTargetDependency */ = {
|
| + isa = PBXTargetDependency;
|
| + name = libevent;
|
| + targetProxy = 7B2630250E82F1EF001CE27F /* PBXContainerItemProxy */;
|
| + };
|
| 7B4DF5340E5B6A58004D7619 /* PBXTargetDependency */ = {
|
| isa = PBXTargetDependency;
|
| name = skia;
|
|
|