| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 # path. | 76 # path. |
| 77 ['"<(GENERATOR)"=="ninja"', { 'logging_dir': '../..' }, | 77 ['"<(GENERATOR)"=="ninja"', { 'logging_dir': '../..' }, |
| 78 { 'logging_dir': '.' } | 78 { 'logging_dir': '.' } |
| 79 ], | 79 ], |
| 80 ], | 80 ], |
| 81 }, | 81 }, |
| 82 # GCC_PREFIX_HEADER is relative to the current directory, | 82 # GCC_PREFIX_HEADER is relative to the current directory, |
| 83 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the | 83 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the |
| 84 # build directory. | 84 # build directory. |
| 85 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, | 85 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, |
| 86 'msvs_system_include_dirs': [ | |
| 87 '<(DEPTH)/build', | |
| 88 ], | |
| 89 'msvs_settings': { | 86 'msvs_settings': { |
| 90 'VCCLCompilerTool': { | 87 'VCCLCompilerTool': { |
| 91 'ForcedIncludeFiles': [ | 88 'ForcedIncludeFiles': [ |
| 92 'intsafe_workaround.h', # http://crbug.com/308740 | |
| 93 'sdch/<(logging_path)', | 89 'sdch/<(logging_path)', |
| 94 ] | 90 ] |
| 95 } | 91 } |
| 96 }, | 92 }, |
| 97 'cflags': [ | 93 'cflags': [ |
| 98 '-include', '<(logging_dir)/sdch/<(logging_path)', | 94 '-include', '<(logging_dir)/sdch/<(logging_path)', |
| 99 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: | 95 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: |
| 100 '-Wno-deprecated-declarations', | 96 '-Wno-deprecated-declarations', |
| 101 ], | 97 ], |
| 102 }, | 98 }, |
| 103 ], | 99 ], |
| 104 } | 100 } |
| OLD | NEW |