diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 18:56:42 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 18:56:42 +0000 |
| commit | a0d670a4fe0fdaf5e404e5b7e7a72aa3d00ed472 (patch) | |
| tree | 3f54f1acdae23660b00a4786e323e6a2f10d6f14 /third_party | |
| parent | e97312216995157075d5d2e1ed8ee62618a5a155 (diff) | |
| download | chromium_src-a0d670a4fe0fdaf5e404e5b7e7a72aa3d00ed472.zip chromium_src-a0d670a4fe0fdaf5e404e5b7e7a72aa3d00ed472.tar.gz chromium_src-a0d670a4fe0fdaf5e404e5b7e7a72aa3d00ed472.tar.bz2 | |
Allow protobuf to build on Windows by using the
config.h provided (by the protobuf project) for
msvc.
Review URL: http://codereview.chromium.org/173370
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/protobuf2/protobuf.gyp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp index 0800cb1..4e3519b 100644 --- a/third_party/protobuf2/protobuf.gyp +++ b/third_party/protobuf2/protobuf.gyp @@ -6,6 +6,19 @@ 'includes': [ '../../build/common.gypi', ], + 'conditions': [ + ['OS!="win"', { + 'variables': { + 'config_h_dir': + '.', # crafted for gcc/linux. + }, + }, { # else, OS=="win" + 'variables': { + 'config_h_dir': + 'src/vsprojects', # crafted for msvc. + }, + }] + ], 'targets': [ { 'target_name': 'protobuf', 'type': '<(library)', @@ -73,6 +86,7 @@ 'src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc', 'src/src/google/protobuf/compiler/importer.cc', 'src/src/google/protobuf/compiler/parser.cc', + '<(config_h_dir)/config.h', ], 'conditions': [ @@ -93,13 +107,13 @@ ], 'include_dirs': [ - '.', + '<(config_h_dir)', 'src/src', ], 'direct_dependent_settings': { 'include_dirs': [ - '.', + '<(config_h_dir)', 'src/src', ], }, @@ -162,7 +176,7 @@ ], 'include_dirs': [ - '.', + '<(config_h_dir)', 'src/src', ], }, |