| OLD | NEW |
| 1 # | 1 # |
| 2 { | 2 { |
| 3 'variables': { | 3 'variables': { |
| 4 #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp | 4 #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp |
| 5 'sample_pdf_file_viewer%': 0, | 5 'sample_pdf_file_viewer%': 0, |
| 6 }, | 6 }, |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'SampleApp', | 9 'target_name': 'SampleApp', |
| 10 'type': 'executable', | 10 'type': 'executable', |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 #'../experimental/Networking/SkSockets.cpp', | 127 #'../experimental/Networking/SkSockets.cpp', |
| 128 #'../experimental/Networking/SkSockets.h', | 128 #'../experimental/Networking/SkSockets.h', |
| 129 | 129 |
| 130 # TiledPipeController | 130 # TiledPipeController |
| 131 '../src/pipe/utils/SamplePipeControllers.h', | 131 '../src/pipe/utils/SamplePipeControllers.h', |
| 132 '../src/pipe/utils/SamplePipeControllers.cpp', | 132 '../src/pipe/utils/SamplePipeControllers.cpp', |
| 133 | 133 |
| 134 # Lua | 134 # Lua |
| 135 '../src/utils/SkLuaCanvas.cpp', | 135 '../src/utils/SkLuaCanvas.cpp', |
| 136 '../src/utils/SkLua.cpp', | 136 '../src/utils/SkLua.cpp', |
| 137 | |
| 138 # tools | |
| 139 '../tools/sk_tool_utils.cpp', | |
| 140 ], | 137 ], |
| 141 'sources!': [ | 138 'sources!': [ |
| 142 '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't c
ompile | 139 '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't c
ompile |
| 143 '../samplecode/SampleWarp.cpp', | 140 '../samplecode/SampleWarp.cpp', |
| 144 '../samplecode/SampleFontCache.cpp', | 141 '../samplecode/SampleFontCache.cpp', |
| 145 ], | 142 ], |
| 146 'dependencies': [ | 143 'dependencies': [ |
| 147 'animator.gyp:animator', | 144 'animator.gyp:animator', |
| 148 'etc1.gyp:libetc1', | 145 'etc1.gyp:libetc1', |
| 149 'experimental.gyp:experimental', | 146 'experimental.gyp:experimental', |
| 150 'flags.gyp:flags', | 147 'flags.gyp:flags', |
| 151 'lua.gyp:lua', | 148 'lua.gyp:lua', |
| 152 'pdf.gyp:pdf', | 149 'pdf.gyp:pdf', |
| 153 'resources.gyp:resources', | 150 'resources.gyp:resources', |
| 151 'sk_tool_utils.gyp:sk_tool_utils', |
| 154 'skia_lib.gyp:skia_lib', | 152 'skia_lib.gyp:skia_lib', |
| 155 'views.gyp:views', | 153 'views.gyp:views', |
| 156 'views_animated.gyp:views_animated', | 154 'views_animated.gyp:views_animated', |
| 157 'xml.gyp:xml', | 155 'xml.gyp:xml', |
| 158 ], | 156 ], |
| 159 'conditions' : [ | 157 'conditions' : [ |
| 160 [ 'sample_pdf_file_viewer == 1', { | 158 [ 'sample_pdf_file_viewer == 1', { |
| 161 'defines': [ | 159 'defines': [ |
| 162 'SAMPLE_PDF_FILE_VIEWER', | 160 'SAMPLE_PDF_FILE_VIEWER', |
| 163 ], | 161 ], |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 }], | 300 }], |
| 303 ], | 301 ], |
| 304 'msvs_settings': { | 302 'msvs_settings': { |
| 305 'VCLinkerTool': { | 303 'VCLinkerTool': { |
| 306 'SubSystem': '2', | 304 'SubSystem': '2', |
| 307 }, | 305 }, |
| 308 }, | 306 }, |
| 309 }, | 307 }, |
| 310 ], | 308 ], |
| 311 } | 309 } |
| OLD | NEW |