From 8407ae3a44eb213d000440f5eabbaf3f57a84afa Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 27 Dec 2016 14:47:47 -0700 Subject: android: Update build scripts w/enum_string codegen The enum_string_helper header is now generated from vk.xml. Change-Id: I6adf09663c87b21623993a939a8ad60e343a805d --- build-android/android-generate.bat | 2 +- build-android/android-generate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'build-android') diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index b99f9c62..7761e21d 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -19,10 +19,10 @@ if exist generated ( ) mkdir generated\include generated\common -py -3 ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include py -3 ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include cd generated/include +py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index 4c3da0dc..4896c809 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -21,9 +21,9 @@ cd $dir rm -rf generated mkdir -p generated/include generated/common -python3 ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include python3 ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include +( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h ) -- cgit v1.2.3