Index: gyp/gpu.gyp |
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp |
index 43204a454844e9a2a54bbfaf3657232b7b23c6cb..057b742510bfa748202845b710c9c113280da51a 100644 |
--- a/gyp/gpu.gyp |
+++ b/gyp/gpu.gyp |
@@ -235,12 +235,17 @@ |
}, |
}], |
[ 'skia_vulkan', { |
+ 'dependencies': [ |
+ 'shaderc.gyp:shaderc_combined', |
+ ], |
'include_dirs': [ |
- '../third_party/' # To include files under third_party/vulkan |
+ '../third_party/', # To include files under third_party/vulkan |
+ '../third_party/externals/shaderc2/libshaderc/include', |
], |
'direct_dependent_settings': { |
'include_dirs': [ |
- '../third_party/' # To include files under third_party/vulkan |
+ '../third_party/', # To include files under third_party/vulkan |
+ '../third_party/externals/shaderc2/libshaderc/include', |
], |
}, |
'conditions' : [ |
@@ -250,7 +255,6 @@ |
'VCLinkerTool': { |
'AdditionalDependencies': [ |
'vulkan-1.lib', |
- 'shaderc_combined.lib' |
], |
}, |
}, |
@@ -262,7 +266,6 @@ |
'VCLinkerTool': { |
'AdditionalLibraryDirectories': [ |
'../third_party/vulkan', |
- '../third_party/shaderc/Debug', |
], |
}, |
}, |
@@ -272,7 +275,6 @@ |
'VCLinkerTool': { |
'AdditionalLibraryDirectories': [ |
'../third_party/vulkan', |
- '../third_party/shaderc/Release', |
], |
}, |
}, |
@@ -282,7 +284,6 @@ |
'VCLinkerTool': { |
'AdditionalLibraryDirectories': [ |
'../third_party/vulkan', |
- '../third_party/shaderc/Debug', |
], |
}, |
}, |
@@ -292,7 +293,6 @@ |
'VCLinkerTool': { |
'AdditionalLibraryDirectories': [ |
'../third_party/vulkan', |
- '../third_party/shaderc/Release', |
], |
}, |
}, |