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

Unified Diff: gyp/gpu.gyp

Issue 1718273002: Incorporate Vulkan files into main gpu.gyp/gpu.gypi (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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/gpu.gypi » ('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 4179e1f7997ea72f9645400d77d9202d9bc3c6f5..e2b70648d42407ded44dbf2be8bd07fc6a77022a 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -107,6 +107,7 @@
'<@(skgpu_mesa_gl_sources)',
'<@(skgpu_debug_gl_sources)',
'<@(skgpu_null_gl_sources)',
+ '<@(skgpu_vk_sources)',
'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
],
'conditions': [
@@ -233,6 +234,84 @@
],
},
}],
+ [ 'skia_vulkan', {
+ 'include_dirs': [
+ '../third_party/' # To include files under third_party/vulkan
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/' # To include files under third_party/vulkan
+ ],
+ },
+ 'conditions' : [
+ ['skia_os == "win"', {
+ 'all_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': [
+ 'vulkan-1.lib',
+ 'shaderc.lib',
+ 'shaderc_util.lib',
+ 'glslang.lib',
+ 'OSDependent.lib',
+ 'OGLCompiler.lib',
+ 'SPIRV-Tools.lib',
+ 'SPIRV.lib',
+ ],
+ },
+ },
+ },
+ 'link_settings': {
+ 'configurations': {
+ 'Debug': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': [
+ '../third_party/vulkan',
+ '../third_party/shaderc/Debug',
+ ],
+ },
+ },
+ },
+ 'Release': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': [
+ '../third_party/vulkan',
+ '../third_party/shaderc/Release',
+ ],
+ },
+ },
+ },
+ 'Debug_x64': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': [
+ '../third_party/vulkan',
+ '../third_party/shaderc/Debug',
+ ],
+ },
+ },
+ },
+ 'Release_x64': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': [
+ '../third_party/vulkan',
+ '../third_party/shaderc/Release',
+ ],
+ },
+ },
+ },
+ },
+ },
+ }],
+ ],
+ }, {
+ 'sources!': [
+ '<@(skgpu_vk_sources)',
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | gyp/gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698