diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-11-18 15:04:50 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-11-21 12:06:12 -0700 |
| commit | da10201f0c5cc12f4a6a4a95065314b06b13ef69 (patch) | |
| tree | 315f3649f37af23e01d8ff10f49f24192751fb8e /build-android | |
| parent | 851836648dce3c2ae235a51e08eb9e7b1c3a5857 (diff) | |
build: Move vk.xml file into scripts dir
- Update android-generate batch/script files
- Update layers CMakeLists.txt file
Change-Id: I6423f441d61daa20aef2cc5e8bc719113fd7978d
Diffstat (limited to 'build-android')
| -rw-r--r-- | build-android/android-generate.bat | 6 | ||||
| -rwxr-xr-x | build-android/android-generate.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 96491e1a..519e0ef5 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -25,9 +25,9 @@ python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan python ../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 ../../../vk.xml thread_check.h
-python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml parameter_validation.h
-python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.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
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 66293fd9..fb82998c 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -26,9 +26,9 @@ python ../scripts/vk-generate.py Android dispatch-table-ops layer > generated/in 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 -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml thread_check.h ) -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml parameter_validation.h ) -( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../vk.xml unique_objects_wrappers.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 ) cp -f ../layers/vk_layer_config.cpp generated/common/ cp -f ../layers/vk_layer_extension_utils.cpp generated/common/ |