summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf/protobuf.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/protobuf/protobuf.gyp')
-rw-r--r--third_party/protobuf/protobuf.gyp34
1 files changed, 33 insertions, 1 deletions
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 67de315..dc6a642 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -40,8 +40,10 @@
'type': 'static_library',
'toolsets': ['host', 'target'],
'sources': [
+ 'src/google/protobuf/stubs/atomicops.h',
'src/google/protobuf/stubs/common.h',
'src/google/protobuf/stubs/once.h',
+ 'src/google/protobuf/stubs/platform_macros.h',
'src/google/protobuf/extension_set.h',
'src/google/protobuf/generated_message_util.h',
'src/google/protobuf/message_lite.h',
@@ -70,6 +72,36 @@
'src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
'<(config_h_dir)/config.h',
],
+ 'conditions': [
+ ['OS == "win"', {
+ 'sources+': [
+ 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
+ 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
+ ],
+ }],
+ ['OS == "mac"', {
+ 'sources+': [
+ 'src/google/protobuf/stubs/atomicops_internals_x86_macosx.h',
+ ],
+ }],
+ ['"<(target_arch)" == "arm"', {
+ 'sources+': [
+ 'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
+ ],
+ }],
+ ['"<(target_arch)" == "mips"', {
+ 'sources+': [
+ 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',
+ ],
+ }],
+ ['"<(target_arch)" == "ia32" or "<(target_arch)" == "x64"', {
+ 'sources+': [
+ 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
+ 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',
+ ],
+ }],
+ ],
+
'include_dirs': [
'<(config_h_dir)',
'src',