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

Side by Side Diff: gyp/gpu.gyp

Issue 1761643002: Use installed vulkan SDK and remove checked in SDK (Closed) Base URL: https://skia.googlesource.com/skia@sc2
Patch Set: rebase 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 | third_party/vulkan/vk_platform.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 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1', 228 'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1',
229 ], 229 ],
230 'link_settings': { 230 'link_settings': {
231 'libraries': [ 231 'libraries': [
232 '-lGLESv2', 232 '-lGLESv2',
233 '-lEGL', 233 '-lEGL',
234 ], 234 ],
235 }, 235 },
236 }], 236 }],
237 [ 'skia_vulkan', { 237 [ 'skia_vulkan', {
238 'variables': {
239 'conditions': [
240 [ 'skia_os == "win"', {
241 'vulkan_sdk_path' : '<!(echo %VK_SDK_PATH%)',
242 }, {
243 'vulkan_sdk_path' : '<!(echo $VK_SDK_PATH)',
244 }],
245 ],
246 },
238 'dependencies': [ 247 'dependencies': [
239 'shaderc.gyp:shaderc_combined', 248 'shaderc.gyp:shaderc_combined',
240 ], 249 ],
241 'include_dirs': [ 250 'include_dirs': [
242 '../third_party/', # To include files under third_party/vulkan 251 '../third_party/', # To include files under third_party/vulkan
243 '../third_party/externals/shaderc2/libshaderc/include', 252 '../third_party/externals/shaderc2/libshaderc/include',
253 '<(vulkan_sdk_path)/Include',
244 ], 254 ],
245 'direct_dependent_settings': { 255 'direct_dependent_settings': {
246 'include_dirs': [ 256 'include_dirs': [
247 '../third_party/', # To include files under third_party/vulkan 257 '../third_party/', # To include files under third_party/vulkan
248 '../third_party/externals/shaderc2/libshaderc/include', 258 '../third_party/externals/shaderc2/libshaderc/include',
259 '<(vulkan_sdk_path)/Include',
249 ], 260 ],
250 }, 261 },
251 'conditions' : [ 262 'link_settings': {
252 ['skia_os == "win"', { 263 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
253 'all_dependent_settings': { 264 'libraries': [ '-lvulkan-1', ],
254 'msvs_settings': { 265 },
255 'VCLinkerTool': {
256 'AdditionalDependencies': [
257 'vulkan-1.lib',
258 ],
259 },
260 },
261 },
262 'link_settings': {
263 'configurations': {
264 'Debug': {
265 'msvs_settings': {
266 'VCLinkerTool': {
267 'AdditionalLibraryDirectories': [
268 '../third_party/vulkan',
269 ],
270 },
271 },
272 },
273 'Release': {
274 'msvs_settings': {
275 'VCLinkerTool': {
276 'AdditionalLibraryDirectories': [
277 '../third_party/vulkan',
278 ],
279 },
280 },
281 },
282 'Debug_x64': {
283 'msvs_settings': {
284 'VCLinkerTool': {
285 'AdditionalLibraryDirectories': [
286 '../third_party/vulkan',
287 ],
288 },
289 },
290 },
291 'Release_x64': {
292 'msvs_settings': {
293 'VCLinkerTool': {
294 'AdditionalLibraryDirectories': [
295 '../third_party/vulkan',
296 ],
297 },
298 },
299 },
300 },
301 },
302 }],
303 ],
304 }, { 266 }, {
305 'sources!': [ 267 'sources!': [
306 '<@(skgpu_vk_sources)', 268 '<@(skgpu_vk_sources)',
307 ], 269 ],
308 }], 270 }],
309 ], 271 ],
310 }, 272 },
311 ], 273 ],
312 } 274 }
OLDNEW
« no previous file with comments | « no previous file | third_party/vulkan/vk_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698