| OLD | NEW |
| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 ], | 46 ], |
| 47 'qt_libs': [ | 47 'qt_libs': [ |
| 48 '<(qt_sdk)/QtCore.framework', | 48 '<(qt_sdk)/QtCore.framework', |
| 49 '<(qt_sdk)/QtGui.framework', | 49 '<(qt_sdk)/QtGui.framework', |
| 50 '<(qt_sdk)/QtOpenGL.framework', | 50 '<(qt_sdk)/QtOpenGL.framework', |
| 51 ], | 51 ], |
| 52 }], | 52 }], |
| 53 [ 'skia_os == "win"', { | 53 [ 'skia_os == "win"', { |
| 54 'variables': { | 54 'variables': { |
| 55 # This is the default location for the version of Qt current on 10/11/
12 | 55 # This is the default location for the version of Qt current on 10/11/
12 |
| 56 'qt_sdk%': 'C:/Qt/4.8.3/', | 56 'qt_sdk%': 'C:/Qt/4.8.6/', |
| 57 }, | 57 }, |
| 58 'qt_sdk': '<(qt_sdk)', | 58 'qt_sdk': '<(qt_sdk)', |
| 59 'qt_moc%': '<(qt_sdk)/bin/moc', | 59 'qt_moc%': '<(qt_sdk)/bin/moc', |
| 60 'qt_includes': [ | 60 'qt_includes': [ |
| 61 '<(qt_sdk)/include', | 61 '<(qt_sdk)/include', |
| 62 '<(qt_sdk)/include/QtCore', | 62 '<(qt_sdk)/include/QtCore', |
| 63 '<(qt_sdk)/include/QtGui', | 63 '<(qt_sdk)/include/QtGui', |
| 64 '<(qt_sdk)/include/QtOpenGL', | 64 '<(qt_sdk)/include/QtOpenGL', |
| 65 ], | 65 ], |
| 66 'qt_libs': [ | 66 'qt_libs': [ |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 168 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 169 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', | 169 'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', |
| 170 '<(RULE_INPUT_PATH)', | 170 '<(RULE_INPUT_PATH)', |
| 171 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], | 171 '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], |
| 172 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', | 172 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', |
| 173 }, | 173 }, |
| 174 ], | 174 ], |
| 175 }, | 175 }, |
| 176 ], | 176 ], |
| 177 } | 177 } |
| OLD | NEW |