| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'conditions': [ | 3 'conditions': [ |
| 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { | 4 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { |
| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 '../debugger/SkDebugCanvas.h', | 88 '../debugger/SkDebugCanvas.h', |
| 89 '../debugger/SkDebugCanvas.cpp', | 89 '../debugger/SkDebugCanvas.cpp', |
| 90 '../debugger/SkDebugger.cpp', | 90 '../debugger/SkDebugger.cpp', |
| 91 '../debugger/SkDrawCommand.h', | 91 '../debugger/SkDrawCommand.h', |
| 92 '../debugger/SkDrawCommand.cpp', | 92 '../debugger/SkDrawCommand.cpp', |
| 93 '../debugger/SkObjectParser.h', | 93 '../debugger/SkObjectParser.h', |
| 94 '../debugger/SkObjectParser.cpp', | 94 '../debugger/SkObjectParser.cpp', |
| 95 ], | 95 ], |
| 96 'dependencies': [ | 96 'dependencies': [ |
| 97 'skia_base_libs.gyp:skia_base_libs', | 97 'skia_base_libs.gyp:skia_base_libs', |
| 98 'images.gyp:images', | |
| 99 'effects.gyp:effects', | |
| 100 'bench.gyp:bench_timer', | 98 'bench.gyp:bench_timer', |
| 101 'tools.gyp:picture_renderer', | 99 'tools.gyp:picture_renderer', |
| 102 ], | 100 ], |
| 103 'conditions': [ | 101 'conditions': [ |
| 104 [ 'skia_os == "nacl"', { | 102 [ 'skia_os == "nacl"', { |
| 105 'dependencies': [ | |
| 106 'utils.gyp:utils', # For SkBase64.h | |
| 107 ], | |
| 108 'include_dirs': [ | 103 'include_dirs': [ |
| 109 '../src/utils', | 104 '../src/utils', |
| 110 ], | 105 ], |
| 111 'sources': [ | 106 'sources': [ |
| 112 '../platform_tools/nacl/src/nacl_debugger.cpp', | 107 '../platform_tools/nacl/src/nacl_debugger.cpp', |
| 113 ], | 108 ], |
| 114 }, { # skia_os != "nacl" | 109 }, { # skia_os != "nacl" |
| 115 'include_dirs': [ | 110 'include_dirs': [ |
| 116 '../debugger/QT', # For all the QT UI Goodies | 111 '../debugger/QT', # For all the QT UI Goodies |
| 117 '<@(qt_includes)', | 112 '<@(qt_includes)', |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 ], | 184 ], |
| 190 }], | 185 }], |
| 191 ], | 186 ], |
| 192 } | 187 } |
| 193 | 188 |
| 194 # Local Variables: | 189 # Local Variables: |
| 195 # tab-width:2 | 190 # tab-width:2 |
| 196 # indent-tabs-mode:nil | 191 # indent-tabs-mode:nil |
| 197 # End: | 192 # End: |
| 198 # vim: set expandtab tabstop=2 shiftwidth=2: | 193 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |