Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: gyp/libjpeg-turbo.gyp

Issue 1261433009: Refugee from Dead Machine 11: Add SkCanvas::drawLitAtlas call Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/effects.gypi ('k') | include/core/SkCanvas.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'xcode_settings': { 6 'xcode_settings': {
7 'SYMROOT': '<(DEPTH)/xcodebuild', 7 'SYMROOT': '<(DEPTH)/xcodebuild',
8 }, 8 },
9 'variables': { 9 'variables': {
10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo', 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo',
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 ], 223 ],
224 'variables': { 224 'variables': {
225 'yasm_path': '<(PRODUCT_DIR)/yasm.exe', 225 'yasm_path': '<(PRODUCT_DIR)/yasm.exe',
226 'conditions': [ 226 'conditions': [
227 [ 'skia_arch_type == "x86"', { 227 [ 'skia_arch_type == "x86"', {
228 'yasm_format': '-fwin32', 228 'yasm_format': '-fwin32',
229 'yasm_flags': [ 229 'yasm_flags': [
230 '-D__x86__', 230 '-D__x86__',
231 '-DWIN32', 231 '-DWIN32',
232 '-DMSVC', 232 '-DMSVC',
233 '-I../third_party/externals/libjpeg-turbo/win/' 233 '-I../../third_party/externals/libjpeg-turbo/win/'
234 ], 234 ],
235 }, { 235 }, {
236 'yasm_format': '-fwin64', 236 'yasm_format': '-fwin64',
237 'yasm_flags': [ 237 'yasm_flags': [
238 '-D__x86_64__', 238 '-D__x86_64__',
239 '-DWIN64', 239 '-DWIN64',
240 '-DMSVC', 240 '-DMSVC',
241 '-I../third_party/externals/libjpeg-turbo/win/' 241 '-I../../third_party/externals/libjpeg-turbo/win/'
242 ], 242 ],
243 }], 243 }],
244 ], 244 ],
245 }, 245 },
246 }], 246 }],
247 [ 'skia_os == "android" and host_os == "linux" and \ 247 [ 'skia_os == "android" and host_os == "linux" and \
248 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', { 248 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
249 'dependencies': [ 249 'dependencies': [
250 'yasm.gyp:yasm#host', 250 'yasm.gyp:yasm#host',
251 ], 251 ],
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 ], 345 ],
346 'process_outputs_as_sources': 1, 346 'process_outputs_as_sources': 1,
347 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 347 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
348 }], 348 }],
349 ] 349 ]
350 }, 350 },
351 ], 351 ],
352 }, 352 },
353 ], 353 ],
354 } 354 }
OLDNEW
« no previous file with comments | « gyp/effects.gypi ('k') | include/core/SkCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698