summaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2016-12-12 12:05:44 -0700
committerMark Lobodzinski <mark@lunarg.com>2016-12-12 13:45:52 -0700
commitf2526009fc596fd0b93b0f8f721613d022e44f89 (patch)
treea80463b6d00de6508f1a90513b2be7822df8b5a1 /build-android
parent64735cced87cace90965ee14369bb320ba62e0da (diff)
build: Update generate scripts to use python3
Upcoming header scripts require python3 -- updated Windows and Linux android-generate scripts. Change-Id: Iba3b44d0999b5c28b9fc83800a4d54d46cbc2a4c
Diffstat (limited to 'build-android')
-rw-r--r--build-android/android-generate.bat12
-rwxr-xr-xbuild-android/android-generate.sh12
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/