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

Side by Side Diff: gyp/gpu.gyp

Issue 2318633002: Update Windows build to use VULKAN_SDK rather than VK_SDK_PATH (Closed)
Patch Set: Created 4 years, 3 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 | infra/bots/recipe_modules/flavor/default_flavor.py » ('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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 'link_settings': { 177 'link_settings': {
178 'libraries': [ '<(vulkan_lib_name)', ], 178 'libraries': [ '<(vulkan_lib_name)', ],
179 }, 179 },
180 'dependencies': [ 180 'dependencies': [
181 'shaderc.gyp:shaderc_combined', 181 'shaderc.gyp:shaderc_combined',
182 ], 182 ],
183 'conditions': [ 183 'conditions': [
184 [ 'skia_os == "win"', { 184 [ 'skia_os == "win"', {
185 'variables': { 185 'variables': {
186 'vulkan_lib_name': '-lvulkan-1', 186 'vulkan_lib_name': '-lvulkan-1',
187 'vulkan_sdk_path' : '<!(echo %VK_SDK_PATH%)', 187 'vulkan_sdk_path' : '<!(echo %VULKAN_SDK%)',
188 }, 188 },
189 'include_dirs': [ 189 'include_dirs': [
190 '<(vulkan_sdk_path)/Include', 190 '<(vulkan_sdk_path)/Include',
191 ], 191 ],
192 'direct_dependent_settings': { 192 'direct_dependent_settings': {
193 'include_dirs': [ 193 'include_dirs': [
194 '<(vulkan_sdk_path)/Include', 194 '<(vulkan_sdk_path)/Include',
195 ], 195 ],
196 }, 196 },
197 'link_settings': { 197 'link_settings': {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ], 252 ],
253 }, { 253 }, {
254 'sources!': [ 254 'sources!': [
255 '<@(skgpu_vk_sources)', 255 '<@(skgpu_vk_sources)',
256 ], 256 ],
257 }], 257 }],
258 ], 258 ],
259 }, 259 },
260 ], 260 ],
261 } 261 }
OLDNEW
« no previous file with comments | « no previous file | infra/bots/recipe_modules/flavor/default_flavor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698