Skip to content

A
angle
Commit 5e4343a1 by Geoff Lang
Options

Add msvs_cygwin_shell to all actions in vulkan.gypi.

BUG=angleproject:1668 Change-Id: I93bc7584ff7d945f9efde25c3379a282ee246b53 Reviewed-on: https://chromium-review.googlesource.com/497328Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 06f76552
Showing with 19 additions and 0 deletions
src/vulkan_support/vulkan.gypi
...@@ -636,6 +636,7 @@ ...@@ -636,6 +636,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_enum_string_helper_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_enum_string_helper_h',
'message': 'generating vk_enum_string_helper.h', 'message': 'generating vk_enum_string_helper.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -660,6 +661,7 @@ ...@@ -660,6 +661,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_h',
'message': 'generating vk_struct_size_helper.h', 'message': 'generating vk_struct_size_helper.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -684,6 +686,7 @@ ...@@ -684,6 +686,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_c', 'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_c',
'message': 'generating vk_struct_size_helper.c', 'message': 'generating vk_struct_size_helper.c',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -708,6 +711,7 @@ ...@@ -708,6 +711,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_h',
'message': 'generating vk_safe_struct.h', 'message': 'generating vk_safe_struct.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -732,6 +736,7 @@ ...@@ -732,6 +736,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_cpp', 'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_cpp',
'message': 'generating vk_safe_struct.cpp', 'message': 'generating vk_safe_struct.cpp',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -756,6 +761,7 @@ ...@@ -756,6 +761,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_layer_dispatch_table_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_layer_dispatch_table_h',
'message': 'generating vk_layer_dispatch_table.h', 'message': 'generating vk_layer_dispatch_table.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/loader_extension_generator.py', '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
...@@ -778,6 +784,7 @@ ...@@ -778,6 +784,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_dispatch_table_helper_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_dispatch_table_helper_h',
'message': 'generating vk_dispatch_table_helper.h', 'message': 'generating vk_dispatch_table_helper.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/dispatch_table_helper_generator.py', '<(vulkan_layers_path)/scripts/dispatch_table_helper_generator.py',
...@@ -800,6 +807,7 @@ ...@@ -800,6 +807,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_h', 'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_h',
'message': 'generating vk_loader_extensions.h', 'message': 'generating vk_loader_extensions.h',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/loader_extension_generator.py', '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
...@@ -822,6 +830,7 @@ ...@@ -822,6 +830,7 @@
{ {
'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_c', 'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_c',
'message': 'generating vk_loader_extensions.c', 'message': 'generating vk_loader_extensions.c',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/loader_extension_generator.py', '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
...@@ -1009,6 +1018,7 @@ ...@@ -1009,6 +1018,7 @@
{ {
'action_name': 'vulkan_loader_order_deps', 'action_name': 'vulkan_loader_order_deps',
'message': 'stamping for vulkan_loader_order_deps', 'message': 'stamping for vulkan_loader_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/vulkan_loader_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/vulkan_loader_order_deps.stamp' ],
'action': 'action':
...@@ -1037,6 +1047,7 @@ ...@@ -1037,6 +1047,7 @@
{ {
'action_name': 'layer_core_validation_order_deps', 'action_name': 'layer_core_validation_order_deps',
'message': 'stamping for layer_core_validation_order_deps', 'message': 'stamping for layer_core_validation_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_core_validation_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_core_validation_order_deps.stamp' ],
'action': 'action':
...@@ -1074,6 +1085,7 @@ ...@@ -1074,6 +1085,7 @@
{ {
'action_name': 'layer_swapchain_order_deps', 'action_name': 'layer_swapchain_order_deps',
'message': 'stamping for layer_swapchain_order_deps', 'message': 'stamping for layer_swapchain_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_swapchain_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_swapchain_order_deps.stamp' ],
'action': 'action':
...@@ -1111,6 +1123,7 @@ ...@@ -1111,6 +1123,7 @@
{ {
'action_name': 'layer_object_tracker_order_deps', 'action_name': 'layer_object_tracker_order_deps',
'message': 'stamping for layer_object_tracker_order_deps', 'message': 'stamping for layer_object_tracker_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_object_tracker_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_object_tracker_order_deps.stamp' ],
'action': 'action':
...@@ -1158,6 +1171,7 @@ ...@@ -1158,6 +1171,7 @@
{ {
'action_name': 'layer_unique_objects_order_deps', 'action_name': 'layer_unique_objects_order_deps',
'message': 'stamping for layer_unique_objects_order_deps', 'message': 'stamping for layer_unique_objects_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_unique_objects_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_unique_objects_order_deps.stamp' ],
'action': 'action':
...@@ -1169,6 +1183,7 @@ ...@@ -1169,6 +1183,7 @@
{ {
'action_name': 'vulkan_layer_unique_objects_generate', 'action_name': 'vulkan_layer_unique_objects_generate',
'message': 'generating Vulkan unique_objects helpers', 'message': 'generating Vulkan unique_objects helpers',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -1216,6 +1231,7 @@ ...@@ -1216,6 +1231,7 @@
{ {
'action_name': 'layer_threading_order_deps', 'action_name': 'layer_threading_order_deps',
'message': 'stamping for layer_threading_order_deps', 'message': 'stamping for layer_threading_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_threading_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_threading_order_deps.stamp' ],
'action': 'action':
...@@ -1227,6 +1243,7 @@ ...@@ -1227,6 +1243,7 @@
{ {
'action_name': 'vulkan_layer_threading_generate', 'action_name': 'vulkan_layer_threading_generate',
'message': 'generating Vulkan threading header', 'message': 'generating Vulkan threading header',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
...@@ -1274,6 +1291,7 @@ ...@@ -1274,6 +1291,7 @@
{ {
'action_name': 'layer_parameter_validation_order_deps', 'action_name': 'layer_parameter_validation_order_deps',
'message': 'stamping for layer_parameter_validation_order_deps', 'message': 'stamping for layer_parameter_validation_order_deps',
'msvs_cygwin_shell': 0,
'inputs': [ '<@(vulkan_layer_generated_files)' ], 'inputs': [ '<@(vulkan_layer_generated_files)' ],
'outputs': [ '<(angle_gen_path)/vulkan/layer_parameter_validation_order_deps.stamp' ], 'outputs': [ '<(angle_gen_path)/vulkan/layer_parameter_validation_order_deps.stamp' ],
'action': 'action':
...@@ -1285,6 +1303,7 @@ ...@@ -1285,6 +1303,7 @@
{ {
'action_name': 'vulkan_layer_parameter_validation_generate', 'action_name': 'vulkan_layer_parameter_validation_generate',
'message': 'generating Vulkan parameter_validation header', 'message': 'generating Vulkan parameter_validation header',
'msvs_cygwin_shell': 0,
'inputs': 'inputs':
[ [
'<(vulkan_layers_path)/scripts/generator.py', '<(vulkan_layers_path)/scripts/generator.py',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment