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

Unified Diff: gyp/gpu.gyp

Issue 1760493003: Pull and build shaderc rather than use checked in lib/header (Closed) Base URL: https://skia.googlesource.com/skia@depsos
Patch Set: use shaderc2 dir 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 | « DEPS ('k') | gyp/shaderc.gyp » ('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 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',
],
},
},
« no previous file with comments | « DEPS ('k') | gyp/shaderc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698