diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-12-12 12:05:44 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-12-12 13:45:52 -0700 |
| commit | 3a635f75ff30aec1f9b39817ba698e3665c91340 (patch) | |
| tree | 7edd902fd1d1f3c0c0d2dc64a7788a30b7b8b0f7 | |
| parent | 910833c324d385ad2706bb0c1059bea38151d6d2 (diff) | |
| download | usermoji-3a635f75ff30aec1f9b39817ba698e3665c91340.tar.xz | |
build: Update generate scripts to use python3
Upcoming header scripts require python3 -- updated
Windows and Linux android-generate scripts.
Change-Id: Iba3b44d0999b5c28b9fc83800a4d54d46cbc2a4c
| -rw-r--r-- | build-android/android-generate.bat | 12 | ||||
| -rwxr-xr-x | build-android/android-generate.sh | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 48253373..b463418a 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -19,14 +19,14 @@ if exist generated ( )
mkdir generated\include generated\common
-python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
-python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
+py ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
+py ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
cd generated/include
-python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h
-python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h
-python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h
-python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h
+py ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h
+py ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h
+py ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h
+py ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h
cd ../..
copy /Y ..\layers\vk_layer_config.cpp generated\common\
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index 04c837d9..4c3da0dc 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -21,13 +21,13 @@ cd $dir rm -rf generated mkdir -p generated/include generated/common -python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include -python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include +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; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h ) -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h ) -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h ) -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.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 ) +( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h ) cp -f ../layers/vk_layer_config.cpp generated/common/ cp -f ../layers/vk_layer_extension_utils.cpp generated/common/ |