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

Side by Side Diff: skia/skia.gyp

Issue 10830199: Working around quoting in GR_GL_CUSTOM_SETUP_HEADER fix VS2008 builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« DEPS ('K') | « DEPS ('k') | 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 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 '../third_party/skia/src/core', 816 '../third_party/skia/src/core',
817 '../third_party/skia/src/gpu', 817 '../third_party/skia/src/gpu',
818 '../third_party/skia/src/sfnt', 818 '../third_party/skia/src/sfnt',
819 '../third_party/skia/src/utils', 819 '../third_party/skia/src/utils',
820 ], 820 ],
821 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800], 821 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800],
822 'defines': [ 822 'defines': [
823 'SK_GAMMA_SRGB', 823 'SK_GAMMA_SRGB',
824 #'SK_GAMMA_APPLY_TO_A8', 824 #'SK_GAMMA_APPLY_TO_A8',
825 'SK_BUILD_NO_IMAGE_ENCODE', 825 'SK_BUILD_NO_IMAGE_ENCODE',
826 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 826 'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
Mattias Nissler (ping if slow) 2012/08/07 16:19:19 Add a TODO to change back (same below).
Nico 2012/08/07 16:36:27 I don't see the TODO -- can you file a tracking bu
alexeypa (please no reviews) 2012/08/07 16:50:22 Done.
alexeypa (please no reviews) 2012/08/07 16:50:22 Done.
827 'GR_STATIC_RECT_VB=1', 827 'GR_STATIC_RECT_VB=1',
828 'GR_AGGRESSIVE_SHADER_OPTS=1', 828 'GR_AGGRESSIVE_SHADER_OPTS=1',
829 'SK_DISABLE_FAST_AA_STROKE_RECT', 829 'SK_DISABLE_FAST_AA_STROKE_RECT',
830 'SK_DEFERRED_CANVAS_USES_GPIPE=1', 830 'SK_DEFERRED_CANVAS_USES_GPIPE=1',
831 831
832 # temporary for landing Skia rev 3077 with minimal layout test breakage 832 # temporary for landing Skia rev 3077 with minimal layout test breakage
833 'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS', 833 'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
834 834
835 # skia uses static initializers to initialize the serialization logic 835 # skia uses static initializers to initialize the serialization logic
836 # of its "pictures" library. This is currently not used in chrome; if 836 # of its "pictures" library. This is currently not used in chrome; if
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 '../third_party/skia/include/gpu', 1100 '../third_party/skia/include/gpu',
1101 '../third_party/skia/include/gpu/gl', 1101 '../third_party/skia/include/gpu/gl',
1102 '../third_party/skia/include/pipe', 1102 '../third_party/skia/include/pipe',
1103 '../third_party/skia/include/ports', 1103 '../third_party/skia/include/ports',
1104 '../third_party/skia/include/utils', 1104 '../third_party/skia/include/utils',
1105 'ext', 1105 'ext',
1106 ], 1106 ],
1107 'defines': [ 1107 'defines': [
1108 'SK_BUILD_NO_IMAGE_ENCODE', 1108 'SK_BUILD_NO_IMAGE_ENCODE',
1109 'SK_DEFERRED_CANVAS_USES_GPIPE=1', 1109 'SK_DEFERRED_CANVAS_USES_GPIPE=1',
1110 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 1110 'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
1111 'GR_AGGRESSIVE_SHADER_OPTS=1', 1111 'GR_AGGRESSIVE_SHADER_OPTS=1',
1112 ], 1112 ],
1113 'conditions': [ 1113 'conditions': [
1114 ['OS=="android"', { 1114 ['OS=="android"', {
1115 'dependencies!': [ 1115 'dependencies!': [
1116 'skia_opts', 1116 'skia_opts',
1117 '../third_party/zlib/zlib.gyp:zlib', 1117 '../third_party/zlib/zlib.gyp:zlib',
1118 ], 1118 ],
1119 'defines': [ 1119 'defines': [
1120 # Don't use non-NDK available stuff. 1120 # Don't use non-NDK available stuff.
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 ], 1333 ],
1334 'include_dirs': [ 1334 'include_dirs': [
1335 '..', 1335 '..',
1336 ], 1336 ],
1337 'sources': [ 1337 'sources': [
1338 'ext/image_operations_bench.cc', 1338 'ext/image_operations_bench.cc',
1339 ], 1339 ],
1340 }, 1340 },
1341 ], 1341 ],
1342 } 1342 }
OLDNEW
« DEPS ('K') | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698