SHA256
1
0
forked from pool/shaderc
Jan Engelhardt 2024-04-12 18:48:06 +00:00 committed by Git OBS Bridge
parent dfa52e78c3
commit de6056176b

View File

@ -4,11 +4,11 @@
utils/update_build_version.sh | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
Index: shaderc-2023.8/CMakeLists.txt
Index: shaderc-2024.0/CMakeLists.txt
===================================================================
--- shaderc-2023.8.orig/CMakeLists.txt
+++ shaderc-2023.8/CMakeLists.txt
@@ -124,7 +124,6 @@ endif(MSVC)
--- shaderc-2024.0.orig/CMakeLists.txt
+++ shaderc-2024.0/CMakeLists.txt
@@ -120,7 +120,6 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
@ -16,19 +16,19 @@ Index: shaderc-2023.8/CMakeLists.txt
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
@@ -135,7 +134,7 @@ endif()
@@ -131,7 +130,7 @@ endif()
add_custom_target(build-version
${PYTHON_EXECUTABLE}
${Python_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh
${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
Index: shaderc-2023.8/libshaderc/CMakeLists.txt
Index: shaderc-2024.0/libshaderc/CMakeLists.txt
===================================================================
--- shaderc-2023.8.orig/libshaderc/CMakeLists.txt
+++ shaderc-2023.8/libshaderc/CMakeLists.txt
--- shaderc-2024.0.orig/libshaderc/CMakeLists.txt
+++ shaderc-2024.0/libshaderc/CMakeLists.txt
@@ -67,6 +67,8 @@ set(SHADERC_LIBS
shaderc_util
SPIRV # from glslang
@ -38,9 +38,9 @@ Index: shaderc-2023.8/libshaderc/CMakeLists.txt
)
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
Index: shaderc-2023.8/utils/update_build_version.sh
Index: shaderc-2024.0/utils/update_build_version.sh
===================================================================
--- /dev/null
+++ shaderc-2023.8/utils/update_build_version.sh
+++ shaderc-2024.0/utils/update_build_version.sh
@@ -0,0 +1 @@
+#!/bin/true