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

Side by Side Diff: skia/skia.gyp

Issue 10535083: skia.gyp: use VS2010 provided stdint header Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | no next file » | 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 ], 995 ],
996 }], 996 }],
997 [ 'OS == "win"', { 997 [ 'OS == "win"', {
998 'sources!': [ 998 'sources!': [
999 '../third_party/skia/src/core/SkMMapStream.cpp', 999 '../third_party/skia/src/core/SkMMapStream.cpp',
1000 '../third_party/skia/src/ports/SkFontHost_sandbox_none.cpp', 1000 '../third_party/skia/src/ports/SkFontHost_sandbox_none.cpp',
1001 '../third_party/skia/src/ports/SkThread_pthread.cpp', 1001 '../third_party/skia/src/ports/SkThread_pthread.cpp',
1002 '../third_party/skia/src/ports/SkTime_Unix.cpp', 1002 '../third_party/skia/src/ports/SkTime_Unix.cpp',
1003 'ext/SkThread_chrome.cc', 1003 'ext/SkThread_chrome.cc',
1004 ], 1004 ],
1005 }],
1006 # VS 2010 includes its own stdint.h, so the copy in config/win is
1007 # not needed.
1008 [ 'OS == "win" and MSVS_VERSION[:4]!="2010"', {
1005 'include_dirs': [ 1009 'include_dirs': [
1006 'config/win', 1010 'config/win',
1007 ], 1011 ],
1008 'direct_dependent_settings': { 1012 'direct_dependent_settings': {
1009 'include_dirs': [ 1013 'include_dirs': [
1010 'config/win', 1014 'config/win',
1011 ], 1015 ],
1012 }, 1016 },
1013 }], 1017 }],
1014 ['component=="shared_library"', { 1018 ['component=="shared_library"', {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 ['_toolset=="target"', { 1247 ['_toolset=="target"', {
1244 'cflags!': [ '-finstrument-functions' ], 1248 'cflags!': [ '-finstrument-functions' ],
1245 }], 1249 }],
1246 ], 1250 ],
1247 }], 1251 }],
1248 [ 'OS == "mac"', { 1252 [ 'OS == "mac"', {
1249 'xcode_settings': { 1253 'xcode_settings': {
1250 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', 1254 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',
1251 }, 1255 },
1252 }], 1256 }],
1253 [ 'OS == "win"', { 1257 # VS 2010 includes its own stdint.h, so the copy in config/win is
1258 # not needed.
1259 [ 'OS == "win" and MSVS_VERSION[:4]!="2010"', {
1254 'include_dirs': [ 1260 'include_dirs': [
1255 'config/win', 1261 'config/win',
1256 ], 1262 ],
1257 'direct_dependent_settings': { 1263 'direct_dependent_settings': {
1258 'include_dirs': [ 1264 'include_dirs': [
1259 'config/win', 1265 'config/win',
1260 ], 1266 ],
1261 }, 1267 },
1262 }], 1268 }],
1263 [ 'target_arch != "arm"', { 1269 [ 'target_arch != "arm"', {
(...skipping 12 matching lines...) Expand all
1276 ], 1282 ],
1277 'include_dirs': [ 1283 'include_dirs': [
1278 '..', 1284 '..',
1279 ], 1285 ],
1280 'sources': [ 1286 'sources': [
1281 'ext/image_operations_bench.cc', 1287 'ext/image_operations_bench.cc',
1282 ], 1288 ],
1283 }, 1289 },
1284 ], 1290 ],
1285 } 1291 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698