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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/debugger.gyp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/freetype.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/debugger.gyp
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index 03f05907ebe00fe3452f4a6302ed615f1ad44258..e9133901e6a1b2aa1b7896d58c289938949f29cc 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -89,6 +89,8 @@
'../src/ports', # To pull SkFontDescriptor.h
'../bench',
'../tools',
+ '../debugger/QT', # For all the QT UI Goodies
+ '<@(qt_includes)',
],
'sources': [
'../debugger/SkDebugger.cpp',
@@ -98,100 +100,75 @@
'../src/utils/debugger/SkDrawCommand.cpp',
'../src/utils/debugger/SkObjectParser.h',
'../src/utils/debugger/SkObjectParser.cpp',
+ '../debugger/debuggermain.cpp',
+ '../debugger/QT/SkDebuggerGUI.cpp',
+ '../debugger/QT/SkDebuggerGUI.h',
+ '../debugger/QT/SkDrawCommandGeometryWidget.h',
+ '../debugger/QT/SkDrawCommandGeometryWidget.cpp',
+ '../debugger/QT/SkCanvasWidget.cpp',
+ '../debugger/QT/SkCanvasWidget.h',
+ '../debugger/QT/SkInspectorWidget.h',
+ '../debugger/QT/SkInspectorWidget.cpp',
+ '../debugger/QT/SkListWidget.h',
+ '../debugger/QT/SkListWidget.cpp',
+ '../debugger/QT/SkSettingsWidget.h',
+ '../debugger/QT/SkSettingsWidget.cpp',
+ '../debugger/QT/SkGLWidget.h',
+ '../debugger/QT/SkGLWidget.cpp',
+ '../debugger/QT/SkRasterWidget.h',
+ '../debugger/QT/SkRasterWidget.cpp',
+
+ # To update this file edit SkIcons.qrc and rerun rcc to generate cpp
+ '../debugger/QT/qrc_SkIcons.cpp',
+
+ # Generated MOC files
+ '<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
+ '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
+ '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp',
+ '<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
+ '<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
+ '<(moc_gen_dir)/moc_SkRasterWidget.cpp',
+ '<(moc_gen_dir)/moc_SkGLWidget.cpp',
],
'dependencies': [
+ 'debugger_qt_mocs',
'skia_lib.gyp:skia_lib',
'tools.gyp:picture_renderer',
'tools.gyp:timer',
],
- 'conditions': [
- [ 'skia_os == "nacl"', {
- 'include_dirs': [
- '../src/utils',
- ],
- 'sources': [
- '../platform_tools/nacl/src/nacl_debugger.cpp',
- ],
- }, { # skia_os != "nacl"
- 'include_dirs': [
- '../debugger/QT', # For all the QT UI Goodies
- '<@(qt_includes)',
- ],
- 'sources': [
- '../debugger/debuggermain.cpp',
- '../debugger/QT/SkDebuggerGUI.cpp',
- '../debugger/QT/SkDebuggerGUI.h',
- '../debugger/QT/SkDrawCommandGeometryWidget.h',
- '../debugger/QT/SkDrawCommandGeometryWidget.cpp',
- '../debugger/QT/SkCanvasWidget.cpp',
- '../debugger/QT/SkCanvasWidget.h',
- '../debugger/QT/SkInspectorWidget.h',
- '../debugger/QT/SkInspectorWidget.cpp',
- '../debugger/QT/SkListWidget.h',
- '../debugger/QT/SkListWidget.cpp',
- '../debugger/QT/SkSettingsWidget.h',
- '../debugger/QT/SkSettingsWidget.cpp',
- '../debugger/QT/SkGLWidget.h',
- '../debugger/QT/SkGLWidget.cpp',
- '../debugger/QT/SkRasterWidget.h',
- '../debugger/QT/SkRasterWidget.cpp',
-
- # To update this file edit SkIcons.qrc and rerun rcc to generate cpp
- '../debugger/QT/qrc_SkIcons.cpp',
-
- # Generated MOC files
- '<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
- '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
- '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp',
- '<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
- '<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
- '<(moc_gen_dir)/moc_SkRasterWidget.cpp',
- '<(moc_gen_dir)/moc_SkGLWidget.cpp',
- ],
- 'cflags': [
- # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127
- '-Wno-uninitialized',
- ],
- 'dependencies': [
- 'debugger_qt_mocs',
- ],
- 'link_settings': {
- 'libraries': [
- '<@(qt_libs)',
- ],
- },
- }],
+ 'cflags': [
+ # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127
+ '-Wno-uninitialized',
],
+ 'link_settings': {
+ 'libraries': [
+ '<@(qt_libs)',
+ ],
+ },
},
- ],
- 'conditions': [
- [ 'skia_os != "nacl"', {
- 'targets': [
+ {
+ 'target_name': 'debugger_qt_mocs',
+ 'type': 'none',
+ 'sources': [
+ '<(moc_src_dir)/SkCanvasWidget.h',
+ '<(moc_src_dir)/SkDebuggerGUI.h',
+ '<(moc_src_dir)/SkDrawCommandGeometryWidget.h',
+ '<(moc_src_dir)/SkInspectorWidget.h',
+ '<(moc_src_dir)/SkSettingsWidget.h',
+ '<(moc_src_dir)/SkRasterWidget.h',
+ '<(moc_src_dir)/SkGLWidget.h',
+ ],
+ 'rules': [
{
- 'target_name': 'debugger_qt_mocs',
- 'type': 'none',
- 'sources': [
- '<(moc_src_dir)/SkCanvasWidget.h',
- '<(moc_src_dir)/SkDebuggerGUI.h',
- '<(moc_src_dir)/SkDrawCommandGeometryWidget.h',
- '<(moc_src_dir)/SkInspectorWidget.h',
- '<(moc_src_dir)/SkSettingsWidget.h',
- '<(moc_src_dir)/SkRasterWidget.h',
- '<(moc_src_dir)/SkGLWidget.h',
- ],
- 'rules': [
- {
- 'rule_name': 'generate_moc',
- 'extension': 'h',
- 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
- 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
- '<(RULE_INPUT_PATH)',
- '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
- 'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
- },
- ],
+ 'rule_name': 'generate_moc',
+ 'extension': 'h',
+ 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
+ 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
+ '<(RULE_INPUT_PATH)',
+ '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
+ 'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
},
],
- }],
+ },
],
}
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/freetype.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698