Source release v2.1.3-2-789 + third_party libs
Change-Id: I8648756dab3fe1f53d6da18b83cd1294581d1abe
This commit is contained in:
2
third_party/protobuf.gyp
vendored
2
third_party/protobuf.gyp
vendored
@@ -52,6 +52,7 @@
|
||||
'target_name': 'protobuf',
|
||||
'type': 'static_library',
|
||||
'toolsets': ['host'],
|
||||
'includes': ['xcode_host.gypi'], # xcode workaround
|
||||
'sources': [
|
||||
'<@(protobuf_lite_sources)',
|
||||
|
||||
@@ -89,6 +90,7 @@
|
||||
'target_name': 'protoc',
|
||||
'type': 'executable',
|
||||
'toolsets': ['host'],
|
||||
'includes': ['xcode_host.gypi'], # xcode workaround
|
||||
'sources': [
|
||||
'<(protobuf_source_dir)/src/google/protobuf/compiler/code_generator.cc',
|
||||
'<(protobuf_source_dir)/src/google/protobuf/compiler/command_line_interface.cc',
|
||||
|
||||
15
third_party/xcode_host.gypi
vendored
Normal file
15
third_party/xcode_host.gypi
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
# Copyright 2014 Google Inc. All Rights Reserved.
|
||||
|
||||
# Since the Xcode generator for gyp doesn't support host targets,
|
||||
# the workaround is to add a special xcode_settings section to any
|
||||
# target that must be built for the host. This file encapsulates
|
||||
# those settings such that they can be included into any target.
|
||||
|
||||
{
|
||||
'xcode_settings': {
|
||||
'VALID_ARCHS': 'i386 x86_64',
|
||||
'IPHONEOS_DEPLOYMENT_TARGET': '',
|
||||
'TARGETED_DEVICE_FAMILY': '',
|
||||
'SDKROOT': '',
|
||||
},
|
||||
}
|
||||
Reference in New Issue
Block a user