| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'skia_warnings_as_errors': 0, | 3 'skia_warnings_as_errors': 0, |
| 4 'conditions': [ | 4 'conditions': [ |
| 5 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 5 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
| 6 # Use the systemwide Qt libs by default | 6 # Use the systemwide Qt libs by default |
| 7 'variables': { | 7 'variables': { |
| 8 'qt_sdk%': '/usr', | 8 'qt_sdk%': '/usr', |
| 9 }, | 9 }, |
| 10 'qt_sdk': '<(qt_sdk)', | 10 'qt_sdk': '<(qt_sdk)', |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 ], | 110 ], |
| 111 }, { # skia_os != "nacl" | 111 }, { # skia_os != "nacl" |
| 112 'include_dirs': [ | 112 'include_dirs': [ |
| 113 '../debugger/QT', # For all the QT UI Goodies | 113 '../debugger/QT', # For all the QT UI Goodies |
| 114 '<@(qt_includes)', | 114 '<@(qt_includes)', |
| 115 ], | 115 ], |
| 116 'sources': [ | 116 'sources': [ |
| 117 '../debugger/debuggermain.cpp', | 117 '../debugger/debuggermain.cpp', |
| 118 '../debugger/QT/SkDebuggerGUI.cpp', | 118 '../debugger/QT/SkDebuggerGUI.cpp', |
| 119 '../debugger/QT/SkDebuggerGUI.h', | 119 '../debugger/QT/SkDebuggerGUI.h', |
| 120 '../debugger/QT/SkDrawCommandGeometryWidget.h', |
| 121 '../debugger/QT/SkDrawCommandGeometryWidget.cpp', |
| 120 '../debugger/QT/SkCanvasWidget.cpp', | 122 '../debugger/QT/SkCanvasWidget.cpp', |
| 121 '../debugger/QT/SkCanvasWidget.h', | 123 '../debugger/QT/SkCanvasWidget.h', |
| 122 '../debugger/QT/SkInspectorWidget.h', | 124 '../debugger/QT/SkInspectorWidget.h', |
| 123 '../debugger/QT/SkInspectorWidget.cpp', | 125 '../debugger/QT/SkInspectorWidget.cpp', |
| 124 '../debugger/QT/SkListWidget.h', | 126 '../debugger/QT/SkListWidget.h', |
| 125 '../debugger/QT/SkListWidget.cpp', | 127 '../debugger/QT/SkListWidget.cpp', |
| 126 '../debugger/QT/SkSettingsWidget.h', | 128 '../debugger/QT/SkSettingsWidget.h', |
| 127 '../debugger/QT/SkSettingsWidget.cpp', | 129 '../debugger/QT/SkSettingsWidget.cpp', |
| 128 '../debugger/QT/SkGLWidget.h', | 130 '../debugger/QT/SkGLWidget.h', |
| 129 '../debugger/QT/SkGLWidget.cpp', | 131 '../debugger/QT/SkGLWidget.cpp', |
| 130 '../debugger/QT/SkRasterWidget.h', | 132 '../debugger/QT/SkRasterWidget.h', |
| 131 '../debugger/QT/SkRasterWidget.cpp', | 133 '../debugger/QT/SkRasterWidget.cpp', |
| 132 '../debugger/QT/SkImageWidget.h', | |
| 133 '../debugger/QT/SkImageWidget.cpp', | |
| 134 | 134 |
| 135 # To update this file edit SkIcons.qrc and rerun rcc to generate cpp | 135 # To update this file edit SkIcons.qrc and rerun rcc to generate cpp |
| 136 '../debugger/QT/qrc_SkIcons.cpp', | 136 '../debugger/QT/qrc_SkIcons.cpp', |
| 137 | 137 |
| 138 # Generated MOC files | 138 # Generated MOC files |
| 139 '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', | 139 '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', |
| 140 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', | 140 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', |
| 141 '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp', |
| 141 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', | 142 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', |
| 142 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', | 143 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', |
| 143 '<(moc_gen_dir)/moc_SkRasterWidget.cpp', | 144 '<(moc_gen_dir)/moc_SkRasterWidget.cpp', |
| 144 '<(moc_gen_dir)/moc_SkImageWidget.cpp', | |
| 145 '<(moc_gen_dir)/moc_SkGLWidget.cpp', | 145 '<(moc_gen_dir)/moc_SkGLWidget.cpp', |
| 146 ], | 146 ], |
| 147 'cflags': [ | 147 'cflags': [ |
| 148 # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show
_bug.cgi?id=13127 | 148 # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show
_bug.cgi?id=13127 |
| 149 '-Wno-uninitialized', | 149 '-Wno-uninitialized', |
| 150 ], | 150 ], |
| 151 'dependencies': [ | 151 'dependencies': [ |
| 152 'debugger_qt_mocs', | 152 'debugger_qt_mocs', |
| 153 ], | 153 ], |
| 154 'link_settings': { | 154 'link_settings': { |
| 155 'libraries': [ | 155 'libraries': [ |
| 156 '<@(qt_libs)', | 156 '<@(qt_libs)', |
| 157 ], | 157 ], |
| 158 }, | 158 }, |
| 159 }], | 159 }], |
| 160 ], | 160 ], |
| 161 }, | 161 }, |
| 162 ], | 162 ], |
| 163 'conditions': [ | 163 'conditions': [ |
| 164 [ 'skia_os != "nacl"', { | 164 [ 'skia_os != "nacl"', { |
| 165 'targets': [ | 165 'targets': [ |
| 166 { | 166 { |
| 167 'target_name': 'debugger_qt_mocs', | 167 'target_name': 'debugger_qt_mocs', |
| 168 'type': 'none', | 168 'type': 'none', |
| 169 'sources': [ | 169 'sources': [ |
| 170 '<(moc_src_dir)/SkCanvasWidget.h', | 170 '<(moc_src_dir)/SkCanvasWidget.h', |
| 171 '<(moc_src_dir)/SkDebuggerGUI.h', | 171 '<(moc_src_dir)/SkDebuggerGUI.h', |
| 172 '<(moc_src_dir)/SkDrawCommandGeometryWidget.h', |
| 172 '<(moc_src_dir)/SkInspectorWidget.h', | 173 '<(moc_src_dir)/SkInspectorWidget.h', |
| 173 '<(moc_src_dir)/SkSettingsWidget.h', | 174 '<(moc_src_dir)/SkSettingsWidget.h', |
| 174 '<(moc_src_dir)/SkRasterWidget.h', | 175 '<(moc_src_dir)/SkRasterWidget.h', |
| 175 '<(moc_src_dir)/SkImageWidget.h', | |
| 176 '<(moc_src_dir)/SkGLWidget.h', | 176 '<(moc_src_dir)/SkGLWidget.h', |
| 177 ], | 177 ], |
| 178 'rules': [ | 178 'rules': [ |
| 179 { | 179 { |
| 180 'rule_name': 'generate_moc', | 180 'rule_name': 'generate_moc', |
| 181 'extension': 'h', | 181 'extension': 'h', |
| 182 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 182 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 183 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', | 183 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', |
| 184 '<(RULE_INPUT_PATH)', | 184 '<(RULE_INPUT_PATH)', |
| 185 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 185 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 186 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', | 186 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', |
| 187 }, | 187 }, |
| 188 ], | 188 ], |
| 189 }, | 189 }, |
| 190 ], | 190 ], |
| 191 }], | 191 }], |
| 192 ], | 192 ], |
| 193 } | 193 } |
| OLD | NEW |