Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2022-04-29 01:57:46 +0300
committerRay Molenkamp <github@lazydodo.com>2022-04-29 01:57:46 +0300
commit9a25a34e42faaeb5fad84c3a0c2d8d15b892278c (patch)
tree9111dff76cab06b5ce741c9ce47a46e1ddb0d03a /source
parent4b96517e202e208697bae23295db22981627a52c (diff)
shader_builder: fix build issue on windows
shader_builder had no manifest set, leading to the classic common control version being loaded which in turn caused an import error and made the executable fail to initialize.
Diffstat (limited to 'source')
-rw-r--r--source/blender/gpu/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index a675b503f75..d0a3409b280 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -549,10 +549,17 @@ if(WITH_GPU_SHADER_BUILDER)
buildinfoobj
)
else()
+ if(WIN32)
+ # We can re-use the manifest from tests.exe here since it's
+ # rather generic and just selects the appropriate common
+ # controls version.
+ set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest")
+ endif()
add_executable(shader_builder
intern/gpu_shader_builder.cc
intern/gpu_shader_builder_stubs.cc
${shader_create_info_list_file}
+ ${MANIFEST}
)
target_link_libraries(shader_builder PUBLIC