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

Unified Diff: gyp/gpu.gyp

Issue 1761163003: Support building Vulkan on Linux. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments 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 | 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 7b644bb474b4bfafd7aa50855f493bd62440f6d8..c6202555db4a76b85928445b4c5ea7c843192397 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -235,33 +235,42 @@
},
}],
[ 'skia_vulkan', {
- 'variables': {
- 'conditions': [
- [ 'skia_os == "win"', {
+ 'conditions': [
+ [ 'skia_os == "win"', {
+ 'variables': {
+ 'vulkan_lib_name': '-lvulkan-1',
'vulkan_sdk_path' : '<!(echo %VK_SDK_PATH%)',
- }, {
- 'vulkan_sdk_path' : '<!(echo $VK_SDK_PATH)',
- }],
- ],
- },
+ },
+ 'include_dirs': [
+ '<(vulkan_sdk_path)/Include',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(vulkan_sdk_path)/Include',
+ ],
+ },
+ 'link_settings': {
+ 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
+ },
+ }, {
+ 'variables': {
+ 'vulkan_lib_name': '-lvulkan',
+ },
+ }],
+ ],
'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',
],
},
'link_settings': {
- 'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
- 'libraries': [ '-lvulkan-1', ],
+ 'libraries': [ '<(vulkan_lib_name)', ],
},
}, {
'sources!': [
« no previous file with comments | « no previous file | gyp/shaderc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698