diff options
| -rw-r--r-- | build-android/android-generate.bat | 6 | ||||
| -rwxr-xr-x | build-android/android-generate.sh | 6 | ||||
| -rw-r--r-- | layers/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | scripts/vk.xml (renamed from vk.xml) | 0 |
4 files changed, 8 insertions, 8 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/ diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index fa95fd33..84929d9c 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -9,8 +9,8 @@ endmacro() macro(run_vk_layer_xml_generate dependency output) add_custom_command(OUTPUT ${output} - COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${PROJECT_SOURCE_DIR}/vk.xml ${output} - DEPENDS ${PROJECT_SOURCE_DIR}/vk.xml ${SCRIPTS_DIR}/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${SCRIPTS_DIR}/reg.py + COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${SCRIPTS_DIR}/vk.xml ${output} + DEPENDS ${SCRIPTS_DIR}/vk.xml ${SCRIPTS_DIR}/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${SCRIPTS_DIR}/reg.py ) endmacro() |