Use installed vulkan SDK and remove checked in SDK
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1761643002
Review URL: https://codereview.chromium.org/1761643002
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 057b742..7b644bb 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)',