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

Side by Side Diff: gyp/gpu.gyp

Issue 1781013002: Fixes for 32bit win Vulkan build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | src/gpu/vk/GrVkGpu.cpp » ('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 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 # GYP for building gpu 5 # GYP for building gpu
6 { 6 {
7 'target_defaults': { 7 'target_defaults': {
8 'conditions': [ 8 'conditions': [
9 ['skia_os != "win"', { 9 ['skia_os != "win"', {
10 'sources/': [ ['exclude', '_win.(h|cpp)$'], 10 'sources/': [ ['exclude', '_win.(h|cpp)$'],
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 }, 243 },
244 'include_dirs': [ 244 'include_dirs': [
245 '<(vulkan_sdk_path)/Include', 245 '<(vulkan_sdk_path)/Include',
246 ], 246 ],
247 'direct_dependent_settings': { 247 'direct_dependent_settings': {
248 'include_dirs': [ 248 'include_dirs': [
249 '<(vulkan_sdk_path)/Include', 249 '<(vulkan_sdk_path)/Include',
250 ], 250 ],
251 }, 251 },
252 'link_settings': { 252 'link_settings': {
253 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ], 253 'conditions': [
254 [ 'skia_arch_type == "x86"', {
255 'library_dirs': [ '<(vulkan_sdk_path)/Bin32', ],
256 }, {
257 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
258 }],
259 ]
254 }, 260 },
255 }, { 261 }, {
256 'variables': { 262 'variables': {
257 'vulkan_lib_name': '-lvulkan', 263 'vulkan_lib_name': '-lvulkan',
258 }, 264 },
259 }], 265 }],
260 ], 266 ],
261 'dependencies': [ 267 'dependencies': [
262 'shaderc.gyp:shaderc_combined', 268 'shaderc.gyp:shaderc_combined',
263 ], 269 ],
(...skipping 10 matching lines...) Expand all
274 }, 280 },
275 }, { 281 }, {
276 'sources!': [ 282 'sources!': [
277 '<@(skgpu_vk_sources)', 283 '<@(skgpu_vk_sources)',
278 ], 284 ],
279 }], 285 }],
280 ], 286 ],
281 }, 287 },
282 ], 288 ],
283 } 289 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/vk/GrVkGpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698