diff options
Diffstat (limited to 'chromium/sdch/sdch.gyp')
| -rw-r--r-- | chromium/sdch/sdch.gyp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/chromium/sdch/sdch.gyp b/chromium/sdch/sdch.gyp index 8d609d5d4a2..ff2c077b256 100644 --- a/chromium/sdch/sdch.gyp +++ b/chromium/sdch/sdch.gyp @@ -57,9 +57,7 @@ [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], - [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], - # TODO(mark): Remove usage of the deprecated auto_ptr. - [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ], + [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], ], # open-vcdiff's logging.h introduces static initializers. This was # reported upstream years ago ( @@ -85,10 +83,22 @@ # ForcedIncludeFiles is relative to include_dirs, cflags relative to the # build directory. 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, + 'msvs_system_include_dirs': [ + '<(DEPTH)/build', + ], 'msvs_settings': { - 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] } + 'VCCLCompilerTool': { + 'ForcedIncludeFiles': [ + 'intsafe_workaround.h', # http://crbug.com/308740 + 'sdch/<(logging_path)', + ] + } }, - 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], + 'cflags': [ + '-include', '<(logging_dir)/sdch/<(logging_path)', + # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: + '-Wno-deprecated-declarations', + ], }, ], } |