Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: sdch/sdch.gyp

Issue 110273004: Make sdch not use an incompatible stdint.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sdch/README.chromium ('k') | sdch/win/config.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'direct_dependent_settings': { 50 'direct_dependent_settings': {
51 'include_dirs': [ 51 'include_dirs': [
52 'open-vcdiff/src', 52 'open-vcdiff/src',
53 ], 53 ],
54 }, 54 },
55 'conditions': [ 55 'conditions': [
56 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], 56 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ],
57 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], 57 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ],
58 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], 58 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ],
59 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], 59 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ],
60 [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], 60 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ],
61 # TODO(mark): Remove usage of the deprecated auto_ptr. 61 # TODO(mark): Remove usage of the deprecated auto_ptr.
62 [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ], 62 [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ],
63 ], 63 ],
64 # open-vcdiff's logging.h introduces static initializers. This was 64 # open-vcdiff's logging.h introduces static initializers. This was
65 # reported upstream years ago ( 65 # reported upstream years ago (
66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since 66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since
67 # upstream won't fix this, work around it on the chromium side: 67 # upstream won't fix this, work around it on the chromium side:
68 # Inject a header that forwards to base/logging.h instead (which doesn't 68 # Inject a header that forwards to base/logging.h instead (which doesn't
69 # introduce static initializers, and which prevents open-vcdiff's 69 # introduce static initializers, and which prevents open-vcdiff's
70 # logging.h from being used). 70 # logging.h from being used).
(...skipping 14 matching lines...) Expand all
85 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the 85 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the
86 # build directory. 86 # build directory.
87 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, 87 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' },
88 'msvs_settings': { 88 'msvs_settings': {
89 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] } 89 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] }
90 }, 90 },
91 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], 91 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ],
92 }, 92 },
93 ], 93 ],
94 } 94 }
OLDNEW
« no previous file with comments | « sdch/README.chromium ('k') | sdch/win/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698