Chromium Code Reviews| Index: gyp/gpu.gyp |
| diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp |
| index 7b644bb474b4bfafd7aa50855f493bd62440f6d8..aa32f695b1260efb45bf5d106f869ed71e3d8075 100644 |
| --- a/gyp/gpu.gyp |
| +++ b/gyp/gpu.gyp |
| @@ -235,33 +235,44 @@ |
| }, |
| }], |
| [ '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', |
|
egdaniel
2016/03/04 19:38:40
does the sdk install the lib in some /usr/lib or s
bsalomon
2016/03/04 20:50:08
yep
|
| + }, |
| + }], |
| + ], |
| 'dependencies': [ |
| 'shaderc.gyp:shaderc_combined', |
| ], |
| 'include_dirs': [ |
| '../third_party/', # To include files under third_party/vulkan |
|
egdaniel
2016/03/04 19:38:41
is ../third_party/ needed here anymore since we gr
bsalomon
2016/03/04 20:50:08
Done.
|
| '../third_party/externals/shaderc2/libshaderc/include', |
| - '<(vulkan_sdk_path)/Include', |
| ], |
| 'direct_dependent_settings': { |
| 'include_dirs': [ |
| '../third_party/', # To include files under third_party/vulkan |
|
egdaniel
2016/03/04 19:38:40
same for this ../third_party/
bsalomon
2016/03/04 20:50:08
Done.
|
| '../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!': [ |