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

Unified 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, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/vulkan/vk_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 057b742510bfa748202845b710c9c113280da51a..7b644bb474b4bfafd7aa50855f493bd62440f6d8 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -235,72 +235,34 @@
},
}],
[ 'skia_vulkan', {
+ 'variables': {
+ 'conditions': [
+ [ 'skia_os == "win"', {
+ 'vulkan_sdk_path' : '<!(echo %VK_SDK_PATH%)',
+ }, {
+ 'vulkan_sdk_path' : '<!(echo $VK_SDK_PATH)',
+ }],
+ ],
+ },
'dependencies': [
'shaderc.gyp:shaderc_combined',
],
'include_dirs': [
'../third_party/', # To include files under third_party/vulkan
'../third_party/externals/shaderc2/libshaderc/include',
+ '<(vulkan_sdk_path)/Include',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/', # To include files under third_party/vulkan
'../third_party/externals/shaderc2/libshaderc/include',
+ '<(vulkan_sdk_path)/Include',
],
},
- 'conditions' : [
- ['skia_os == "win"', {
- 'all_dependent_settings': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': [
- 'vulkan-1.lib',
- ],
- },
- },
- },
- 'link_settings': {
- 'configurations': {
- 'Debug': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalLibraryDirectories': [
- '../third_party/vulkan',
- ],
- },
- },
- },
- 'Release': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalLibraryDirectories': [
- '../third_party/vulkan',
- ],
- },
- },
- },
- 'Debug_x64': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalLibraryDirectories': [
- '../third_party/vulkan',
- ],
- },
- },
- },
- 'Release_x64': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalLibraryDirectories': [
- '../third_party/vulkan',
- ],
- },
- },
- },
- },
- },
- }],
- ],
+ 'link_settings': {
+ 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
+ 'libraries': [ '-lvulkan-1', ],
+ },
}, {
'sources!': [
'<@(skgpu_vk_sources)',
« 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