From c3e46e0896131b82475af13b8c94686c9897d9dc Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Mon, 10 Jul 2017 17:42:59 +0300 Subject: Updated Xcode project --- xcode/common-debug.xcconfig | 2 +- xcode/common-release.xcconfig | 2 +- .../drape_frontend.xcodeproj/project.pbxproj | 4 +- xcode/indexer/indexer.xcodeproj/project.pbxproj | 4 +- xcode/protobuf/protobuf.xcodeproj/project.pbxproj | 148 +++++++++++++++------ 5 files changed, 112 insertions(+), 48 deletions(-) (limited to 'xcode') diff --git a/xcode/common-debug.xcconfig b/xcode/common-debug.xcconfig index fa6a1fa3b7..69e5ce6ed7 100644 --- a/xcode/common-debug.xcconfig +++ b/xcode/common-debug.xcconfig @@ -4,6 +4,6 @@ COPY_PHASE_STRIP = NO GCC_OPTIMIZATION_LEVEL = 0 GCC_UNROLL_LOOPS = NO ENABLE_NS_ASSERTIONS = YES -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG _DEBUG +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG _DEBUG HAVE_PTHREAD MTL_ENABLE_DEBUG_INFO = YES ENABLE_TESTABILITY = YES diff --git a/xcode/common-release.xcconfig b/xcode/common-release.xcconfig index 56aa329cc4..12cb604068 100644 --- a/xcode/common-release.xcconfig +++ b/xcode/common-release.xcconfig @@ -4,6 +4,6 @@ COPY_PHASE_STRIP = YES GCC_OPTIMIZATION_LEVEL = 3 GCC_UNROLL_LOOPS = YES ENABLE_NS_ASSERTIONS = NO -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG OMIM_PRODUCTION +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG OMIM_PRODUCTION HAVE_PTHREAD MTL_ENABLE_DEBUG_INFO = NO ENABLE_TESTABILITY = NO diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 7984d4540d..0a328cba48 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -1174,7 +1174,7 @@ "$(OMIM_ROOT)", "$(BOOST_ROOT)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf", "$(OMIM_ROOT)/3party/freetype/include", ); @@ -1193,7 +1193,7 @@ "$(OMIM_ROOT)", "$(BOOST_ROOT)", "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf", "$(OMIM_ROOT)/3party/freetype/include", ); diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 9eeb3ec7f4..b392a3b768 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -1162,7 +1162,7 @@ buildSettings = { HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", ); }; name = Debug; @@ -1173,7 +1173,7 @@ buildSettings = { HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", ); }; name = Release; diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj index 980a44d14f..31aa03d651 100644 --- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj +++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj @@ -7,32 +7,56 @@ objects = { /* Begin PBXBuildFile section */ - 670D04DD1B0BACD60013A7AC /* common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04DB1B0BACD60013A7AC /* common.cc */; }; - 670D04DE1B0BACD60013A7AC /* once.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04DC1B0BACD60013A7AC /* once.cc */; }; - 670D04E41B0BADEE0013A7AC /* extension_set.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04DF1B0BADEE0013A7AC /* extension_set.cc */; }; - 670D04E51B0BADEE0013A7AC /* generated_message_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04E01B0BADEE0013A7AC /* generated_message_util.cc */; }; - 670D04E61B0BADEE0013A7AC /* message_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04E11B0BADEE0013A7AC /* message_lite.cc */; }; - 670D04E71B0BADEE0013A7AC /* repeated_field.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04E21B0BADEE0013A7AC /* repeated_field.cc */; }; - 670D04E81B0BADEE0013A7AC /* wire_format_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04E31B0BADEE0013A7AC /* wire_format_lite.cc */; }; - 670D04EC1B0BAE120013A7AC /* coded_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04E91B0BAE120013A7AC /* coded_stream.cc */; }; - 670D04ED1B0BAE120013A7AC /* zero_copy_stream_impl_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04EA1B0BAE120013A7AC /* zero_copy_stream_impl_lite.cc */; }; - 670D04EE1B0BAE120013A7AC /* zero_copy_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 670D04EB1B0BAE120013A7AC /* zero_copy_stream.cc */; }; + 45B8534D1F13C1340087F8ED /* arena.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8534C1F13C1340087F8ED /* arena.cc */; }; + 45B853541F13C17D0087F8ED /* arenastring.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8534E1F13C17D0087F8ED /* arenastring.cc */; }; + 45B853551F13C17D0087F8ED /* extension_set.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8534F1F13C17D0087F8ED /* extension_set.cc */; }; + 45B853561F13C17D0087F8ED /* generated_message_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853501F13C17D0087F8ED /* generated_message_util.cc */; }; + 45B853571F13C17D0087F8ED /* message_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853511F13C17D0087F8ED /* message_lite.cc */; }; + 45B853581F13C17D0087F8ED /* repeated_field.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853521F13C17D0087F8ED /* repeated_field.cc */; }; + 45B853591F13C17D0087F8ED /* wire_format_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853531F13C17D0087F8ED /* wire_format_lite.cc */; }; + 45B8535D1F13C1B30087F8ED /* coded_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8535A1F13C1B30087F8ED /* coded_stream.cc */; }; + 45B8535E1F13C1B30087F8ED /* zero_copy_stream_impl_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8535B1F13C1B30087F8ED /* zero_copy_stream_impl_lite.cc */; }; + 45B8535F1F13C1B30087F8ED /* zero_copy_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8535C1F13C1B30087F8ED /* zero_copy_stream.cc */; }; + 45B8536E1F13C22E0087F8ED /* atomicops_internals_x86_gcc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853621F13C22E0087F8ED /* atomicops_internals_x86_gcc.cc */; }; + 45B8536F1F13C22E0087F8ED /* bytestream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853631F13C22E0087F8ED /* bytestream.cc */; }; + 45B853701F13C22E0087F8ED /* common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853641F13C22E0087F8ED /* common.cc */; }; + 45B853711F13C22E0087F8ED /* int128.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853651F13C22E0087F8ED /* int128.cc */; }; + 45B853721F13C22E0087F8ED /* once.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853661F13C22E0087F8ED /* once.cc */; }; + 45B853731F13C22E0087F8ED /* status.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853671F13C22E0087F8ED /* status.cc */; }; + 45B853741F13C22E0087F8ED /* statusor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853681F13C22E0087F8ED /* statusor.cc */; }; + 45B853751F13C22E0087F8ED /* stringpiece.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B853691F13C22E0087F8ED /* stringpiece.cc */; }; + 45B853761F13C22E0087F8ED /* stringprintf.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8536A1F13C22E0087F8ED /* stringprintf.cc */; }; + 45B853771F13C22E0087F8ED /* structurally_valid.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8536B1F13C22E0087F8ED /* structurally_valid.cc */; }; + 45B853781F13C22E0087F8ED /* strutil.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8536C1F13C22E0087F8ED /* strutil.cc */; }; + 45B853791F13C22E0087F8ED /* time.cc in Sources */ = {isa = PBXBuildFile; fileRef = 45B8536D1F13C22E0087F8ED /* time.cc */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 34F558581DBF3D2E00A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34F558591DBF3D2E00A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; + 45B8534C1F13C1340087F8ED /* arena.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arena.cc; path = protobuf/src/google/protobuf/arena.cc; sourceTree = ""; }; + 45B8534E1F13C17D0087F8ED /* arenastring.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arenastring.cc; path = protobuf/src/google/protobuf/arenastring.cc; sourceTree = ""; }; + 45B8534F1F13C17D0087F8ED /* extension_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = extension_set.cc; path = protobuf/src/google/protobuf/extension_set.cc; sourceTree = ""; }; + 45B853501F13C17D0087F8ED /* generated_message_util.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = generated_message_util.cc; path = protobuf/src/google/protobuf/generated_message_util.cc; sourceTree = ""; }; + 45B853511F13C17D0087F8ED /* message_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = message_lite.cc; path = protobuf/src/google/protobuf/message_lite.cc; sourceTree = ""; }; + 45B853521F13C17D0087F8ED /* repeated_field.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = repeated_field.cc; path = protobuf/src/google/protobuf/repeated_field.cc; sourceTree = ""; }; + 45B853531F13C17D0087F8ED /* wire_format_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wire_format_lite.cc; path = protobuf/src/google/protobuf/wire_format_lite.cc; sourceTree = ""; }; + 45B8535A1F13C1B30087F8ED /* coded_stream.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coded_stream.cc; path = protobuf/src/google/protobuf/io/coded_stream.cc; sourceTree = ""; }; + 45B8535B1F13C1B30087F8ED /* zero_copy_stream_impl_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zero_copy_stream_impl_lite.cc; path = protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc; sourceTree = ""; }; + 45B8535C1F13C1B30087F8ED /* zero_copy_stream.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zero_copy_stream.cc; path = protobuf/src/google/protobuf/io/zero_copy_stream.cc; sourceTree = ""; }; + 45B853621F13C22E0087F8ED /* atomicops_internals_x86_gcc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = atomicops_internals_x86_gcc.cc; path = protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc; sourceTree = ""; }; + 45B853631F13C22E0087F8ED /* bytestream.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bytestream.cc; path = protobuf/src/google/protobuf/stubs/bytestream.cc; sourceTree = ""; }; + 45B853641F13C22E0087F8ED /* common.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = common.cc; path = protobuf/src/google/protobuf/stubs/common.cc; sourceTree = ""; }; + 45B853651F13C22E0087F8ED /* int128.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = int128.cc; path = protobuf/src/google/protobuf/stubs/int128.cc; sourceTree = ""; }; + 45B853661F13C22E0087F8ED /* once.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = once.cc; path = protobuf/src/google/protobuf/stubs/once.cc; sourceTree = ""; }; + 45B853671F13C22E0087F8ED /* status.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = status.cc; path = protobuf/src/google/protobuf/stubs/status.cc; sourceTree = ""; }; + 45B853681F13C22E0087F8ED /* statusor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statusor.cc; path = protobuf/src/google/protobuf/stubs/statusor.cc; sourceTree = ""; }; + 45B853691F13C22E0087F8ED /* stringpiece.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stringpiece.cc; path = protobuf/src/google/protobuf/stubs/stringpiece.cc; sourceTree = ""; }; + 45B8536A1F13C22E0087F8ED /* stringprintf.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stringprintf.cc; path = protobuf/src/google/protobuf/stubs/stringprintf.cc; sourceTree = ""; }; + 45B8536B1F13C22E0087F8ED /* structurally_valid.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = structurally_valid.cc; path = protobuf/src/google/protobuf/stubs/structurally_valid.cc; sourceTree = ""; }; + 45B8536C1F13C22E0087F8ED /* strutil.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = strutil.cc; path = protobuf/src/google/protobuf/stubs/strutil.cc; sourceTree = ""; }; + 45B8536D1F13C22E0087F8ED /* time.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = time.cc; path = protobuf/src/google/protobuf/stubs/time.cc; sourceTree = ""; }; 670D04CD1B0BAC210013A7AC /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 670D04DB1B0BACD60013A7AC /* common.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = common.cc; path = src/google/protobuf/stubs/common.cc; sourceTree = ""; }; - 670D04DC1B0BACD60013A7AC /* once.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = once.cc; path = src/google/protobuf/stubs/once.cc; sourceTree = ""; }; - 670D04DF1B0BADEE0013A7AC /* extension_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = extension_set.cc; path = src/google/protobuf/extension_set.cc; sourceTree = ""; }; - 670D04E01B0BADEE0013A7AC /* generated_message_util.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = generated_message_util.cc; path = src/google/protobuf/generated_message_util.cc; sourceTree = ""; }; - 670D04E11B0BADEE0013A7AC /* message_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = message_lite.cc; path = src/google/protobuf/message_lite.cc; sourceTree = ""; }; - 670D04E21B0BADEE0013A7AC /* repeated_field.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = repeated_field.cc; path = src/google/protobuf/repeated_field.cc; sourceTree = ""; }; - 670D04E31B0BADEE0013A7AC /* wire_format_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wire_format_lite.cc; path = src/google/protobuf/wire_format_lite.cc; sourceTree = ""; }; - 670D04E91B0BAE120013A7AC /* coded_stream.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coded_stream.cc; path = src/google/protobuf/io/coded_stream.cc; sourceTree = ""; }; - 670D04EA1B0BAE120013A7AC /* zero_copy_stream_impl_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zero_copy_stream_impl_lite.cc; path = src/google/protobuf/io/zero_copy_stream_impl_lite.cc; sourceTree = ""; }; - 670D04EB1B0BAE120013A7AC /* zero_copy_stream.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zero_copy_stream.cc; path = src/google/protobuf/io/zero_copy_stream.cc; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -46,6 +70,35 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 45B853601F13C1BD0087F8ED /* io */ = { + isa = PBXGroup; + children = ( + 45B8535A1F13C1B30087F8ED /* coded_stream.cc */, + 45B8535B1F13C1B30087F8ED /* zero_copy_stream_impl_lite.cc */, + 45B8535C1F13C1B30087F8ED /* zero_copy_stream.cc */, + ); + name = io; + sourceTree = ""; + }; + 45B853611F13C1D90087F8ED /* stubs */ = { + isa = PBXGroup; + children = ( + 45B853621F13C22E0087F8ED /* atomicops_internals_x86_gcc.cc */, + 45B853631F13C22E0087F8ED /* bytestream.cc */, + 45B853641F13C22E0087F8ED /* common.cc */, + 45B853651F13C22E0087F8ED /* int128.cc */, + 45B853661F13C22E0087F8ED /* once.cc */, + 45B853671F13C22E0087F8ED /* status.cc */, + 45B853681F13C22E0087F8ED /* statusor.cc */, + 45B853691F13C22E0087F8ED /* stringpiece.cc */, + 45B8536A1F13C22E0087F8ED /* stringprintf.cc */, + 45B8536B1F13C22E0087F8ED /* structurally_valid.cc */, + 45B8536C1F13C22E0087F8ED /* strutil.cc */, + 45B8536D1F13C22E0087F8ED /* time.cc */, + ); + name = stubs; + sourceTree = ""; + }; 670D04C41B0BAC210013A7AC = { isa = PBXGroup; children = ( @@ -67,16 +120,15 @@ 670D04CF1B0BAC210013A7AC /* protobuf */ = { isa = PBXGroup; children = ( - 670D04E91B0BAE120013A7AC /* coded_stream.cc */, - 670D04EA1B0BAE120013A7AC /* zero_copy_stream_impl_lite.cc */, - 670D04EB1B0BAE120013A7AC /* zero_copy_stream.cc */, - 670D04DF1B0BADEE0013A7AC /* extension_set.cc */, - 670D04E01B0BADEE0013A7AC /* generated_message_util.cc */, - 670D04E11B0BADEE0013A7AC /* message_lite.cc */, - 670D04E21B0BADEE0013A7AC /* repeated_field.cc */, - 670D04E31B0BADEE0013A7AC /* wire_format_lite.cc */, - 670D04DB1B0BACD60013A7AC /* common.cc */, - 670D04DC1B0BACD60013A7AC /* once.cc */, + 45B853611F13C1D90087F8ED /* stubs */, + 45B853601F13C1BD0087F8ED /* io */, + 45B8534E1F13C17D0087F8ED /* arenastring.cc */, + 45B8534F1F13C17D0087F8ED /* extension_set.cc */, + 45B853501F13C17D0087F8ED /* generated_message_util.cc */, + 45B853511F13C17D0087F8ED /* message_lite.cc */, + 45B853521F13C17D0087F8ED /* repeated_field.cc */, + 45B853531F13C17D0087F8ED /* wire_format_lite.cc */, + 45B8534C1F13C1340087F8ED /* arena.cc */, ); name = protobuf; path = ../../3party/protobuf; @@ -148,16 +200,28 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 670D04E61B0BADEE0013A7AC /* message_lite.cc in Sources */, - 670D04ED1B0BAE120013A7AC /* zero_copy_stream_impl_lite.cc in Sources */, - 670D04DE1B0BACD60013A7AC /* once.cc in Sources */, - 670D04E51B0BADEE0013A7AC /* generated_message_util.cc in Sources */, - 670D04E41B0BADEE0013A7AC /* extension_set.cc in Sources */, - 670D04E71B0BADEE0013A7AC /* repeated_field.cc in Sources */, - 670D04EC1B0BAE120013A7AC /* coded_stream.cc in Sources */, - 670D04DD1B0BACD60013A7AC /* common.cc in Sources */, - 670D04EE1B0BAE120013A7AC /* zero_copy_stream.cc in Sources */, - 670D04E81B0BADEE0013A7AC /* wire_format_lite.cc in Sources */, + 45B853741F13C22E0087F8ED /* statusor.cc in Sources */, + 45B853571F13C17D0087F8ED /* message_lite.cc in Sources */, + 45B853791F13C22E0087F8ED /* time.cc in Sources */, + 45B853731F13C22E0087F8ED /* status.cc in Sources */, + 45B853751F13C22E0087F8ED /* stringpiece.cc in Sources */, + 45B8535E1F13C1B30087F8ED /* zero_copy_stream_impl_lite.cc in Sources */, + 45B8536E1F13C22E0087F8ED /* atomicops_internals_x86_gcc.cc in Sources */, + 45B853771F13C22E0087F8ED /* structurally_valid.cc in Sources */, + 45B853721F13C22E0087F8ED /* once.cc in Sources */, + 45B853781F13C22E0087F8ED /* strutil.cc in Sources */, + 45B853541F13C17D0087F8ED /* arenastring.cc in Sources */, + 45B853561F13C17D0087F8ED /* generated_message_util.cc in Sources */, + 45B853711F13C22E0087F8ED /* int128.cc in Sources */, + 45B853701F13C22E0087F8ED /* common.cc in Sources */, + 45B8536F1F13C22E0087F8ED /* bytestream.cc in Sources */, + 45B853551F13C17D0087F8ED /* extension_set.cc in Sources */, + 45B853581F13C17D0087F8ED /* repeated_field.cc in Sources */, + 45B8535D1F13C1B30087F8ED /* coded_stream.cc in Sources */, + 45B8534D1F13C1340087F8ED /* arena.cc in Sources */, + 45B853761F13C22E0087F8ED /* stringprintf.cc in Sources */, + 45B8535F1F13C1B30087F8ED /* zero_copy_stream.cc in Sources */, + 45B853591F13C17D0087F8ED /* wire_format_lite.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -171,7 +235,7 @@ GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf/", ); }; @@ -184,7 +248,7 @@ GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/src", + "$(OMIM_ROOT)/3party/protobuf/protobuf/src", "$(OMIM_ROOT)/3party/protobuf/", ); }; -- cgit v1.2.3