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

Side by Side Diff: gyp/debugger.gyp

Issue 1681643002: Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: switched from free to sk_free Created 4 years, 10 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 | « gyp/SampleApp.gyp ('k') | tools/debugger/SkDrawCommand.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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 { 5 {
6 'variables': { 6 'variables': {
7 'skia_warnings_as_errors': 0, 7 'skia_warnings_as_errors': 0,
8 'conditions': [ 8 'conditions': [
9 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 9 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
10 # Use the systemwide Qt libs by default 10 # Use the systemwide Qt libs by default
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', 129 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
130 '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp', 130 '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp',
131 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', 131 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
132 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', 132 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
133 '<(moc_gen_dir)/moc_SkRasterWidget.cpp', 133 '<(moc_gen_dir)/moc_SkRasterWidget.cpp',
134 '<(moc_gen_dir)/moc_SkGLWidget.cpp', 134 '<(moc_gen_dir)/moc_SkGLWidget.cpp',
135 ], 135 ],
136 'dependencies': [ 136 'dependencies': [
137 'debugger_qt_mocs', 137 'debugger_qt_mocs',
138 'skia_lib.gyp:skia_lib', 138 'skia_lib.gyp:skia_lib',
139 'jsoncpp.gyp:jsoncpp',
139 ], 140 ],
140 'cflags': [ 141 'cflags': [
141 # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug .cgi?id=13127 142 # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug .cgi?id=13127
142 '-Wno-uninitialized', 143 '-Wno-uninitialized',
143 ], 144 ],
144 'link_settings': { 145 'link_settings': {
145 'libraries': [ 146 'libraries': [
146 '<@(qt_libs)', 147 '<@(qt_libs)',
147 ], 148 ],
148 }, 149 },
(...skipping 17 matching lines...) Expand all
166 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], 167 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
167 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', 168 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
168 '<(RULE_INPUT_PATH)', 169 '<(RULE_INPUT_PATH)',
169 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], 170 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
170 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', 171 'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
171 }, 172 },
172 ], 173 ],
173 }, 174 },
174 ], 175 ],
175 } 176 }
OLDNEW
« no previous file with comments | « gyp/SampleApp.gyp ('k') | tools/debugger/SkDrawCommand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698