Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'conditions': [ | 3 'conditions': [ |
| 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
| 5 # Use the systemwide Qt libs by default | 5 # Use the systemwide Qt libs by default |
| 6 'variables': { | 6 'variables': { |
| 7 'qt_sdk%': '/usr', | 7 'qt_sdk%': '/usr', |
| 8 }, | 8 }, |
| 9 'qt_sdk': '<(qt_sdk)', | 9 'qt_sdk': '<(qt_sdk)', |
| 10 'qt_moc%': 'moc', | 10 'qt_moc%': 'moc', |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 | 136 |
| 137 # Generated MOC files | 137 # Generated MOC files |
| 138 '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', | 138 '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', |
| 139 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', | 139 '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', |
| 140 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', | 140 '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', |
| 141 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', | 141 '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', |
| 142 '<(moc_gen_dir)/moc_SkRasterWidget.cpp', | 142 '<(moc_gen_dir)/moc_SkRasterWidget.cpp', |
| 143 '<(moc_gen_dir)/moc_SkImageWidget.cpp', | 143 '<(moc_gen_dir)/moc_SkImageWidget.cpp', |
| 144 '<(moc_gen_dir)/moc_SkGLWidget.cpp', | 144 '<(moc_gen_dir)/moc_SkGLWidget.cpp', |
| 145 ], | 145 ], |
| 146 'cflags': [ | |
| 147 # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show _bug.cgi?id=13127 | |
|
bungeman-skia
2014/01/08 16:41:35
Eck, wish this could be scoped a bit tighter. Ah w
mtklein
2014/01/08 16:53:23
Yeah, me too. Sadly it's all headers down from he
| |
| 148 '-Wno-uninitialized', | |
| 149 ], | |
| 146 'dependencies': [ | 150 'dependencies': [ |
| 147 'debugger_qt_mocs', | 151 'debugger_qt_mocs', |
| 148 ], | 152 ], |
| 149 'link_settings': { | 153 'link_settings': { |
| 150 'libraries': [ | 154 'libraries': [ |
| 151 '<@(qt_libs)', | 155 '<@(qt_libs)', |
| 152 ], | 156 ], |
| 153 }, | 157 }, |
| 154 }], | 158 }], |
| 155 ], | 159 ], |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 179 '<(RULE_INPUT_PATH)', | 183 '<(RULE_INPUT_PATH)', |
| 180 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 184 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 181 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', | 185 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', |
| 182 }, | 186 }, |
| 183 ], | 187 ], |
| 184 }, | 188 }, |
| 185 ], | 189 ], |
| 186 }], | 190 }], |
| 187 ], | 191 ], |
| 188 } | 192 } |
| OLD | NEW |