tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Sebastian Parborg 2021-10-28 21:20:25 +02:00
parent ec9357a94e 690300eb4a
commit a6af0e570d
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -160,8 +160,7 @@ if(APPLE)
# Currently this causes a build error linking, disable. # Currently this causes a build error linking, disable.
set(WITH_BLENDER_THUMBNAILER OFF) set(WITH_BLENDER_THUMBNAILER OFF)
elseif(WIN32) elseif(WIN32)
# Building the thumbnail extraction DLL could be made optional. option(WITH_BLENDER_THUMBNAILER "Build \"BlendThumb.dll\" helper for Windows explorer integration" ON)
set(WITH_BLENDER_THUMBNAILER ON)
else() else()
option(WITH_BLENDER_THUMBNAILER "Build \"blender-thumbnailer\" thumbnail extraction utility" ON) option(WITH_BLENDER_THUMBNAILER "Build \"blender-thumbnailer\" thumbnail extraction utility" ON)
endif() endif()

11
source/blender/blendthumb/CMakeLists.txt
View File

@ -56,11 +56,6 @@ if(WIN32)
target_link_libraries(BlendThumb bf_blenlib dbghelp.lib Version.lib) target_link_libraries(BlendThumb bf_blenlib dbghelp.lib Version.lib)
set_target_properties(BlendThumb PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") set_target_properties(BlendThumb PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt")
install(
FILES $<TARGET_FILE:BlendThumb>
COMPONENT Blender
DESTINATION "."
)
else() else()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Build `blender-thumbnailer` executable # Build `blender-thumbnailer` executable
@ -68,10 +63,4 @@ else()
add_executable(blender-thumbnailer ${SRC} src/blender_thumbnailer.cc) add_executable(blender-thumbnailer ${SRC} src/blender_thumbnailer.cc)
target_link_libraries(blender-thumbnailer bf_blenlib) target_link_libraries(blender-thumbnailer bf_blenlib)
target_link_libraries(blender-thumbnailer ${PTHREADS_LIBRARIES}) target_link_libraries(blender-thumbnailer ${PTHREADS_LIBRARIES})
install(
FILES $<TARGET_FILE:blender-thumbnailer>
COMPONENT Blender
DESTINATION "."
)
endif() endif()

4
source/blender/blenlib/CMakeLists.txt
View File

@ -367,6 +367,10 @@ if(WITH_GMP)
endif() endif()
if(WIN32) if(WIN32)
if (WITH_BLENDER_THUMBNAILER)
# Needed for querying the thumbnailer .dll in winstuff.c
add_definitions(-DWITH_BLENDER_THUMBNAILER)
endif()
list(APPEND INC list(APPEND INC
../../../intern/utfconv ../../../intern/utfconv
) )

2
source/blender/blenlib/intern/winstuff.c
View File

@ -172,12 +172,14 @@ bool BLI_windows_register_blend_extension(const bool background)
return false; return false;
} }
# ifdef WITH_BLENDER_THUMBNAILER
BLI_windows_get_executable_dir(InstallDir); BLI_windows_get_executable_dir(InstallDir);
GetSystemDirectory(SysDir, FILE_MAXDIR); GetSystemDirectory(SysDir, FILE_MAXDIR);
ThumbHandlerDLL = "BlendThumb.dll"; ThumbHandlerDLL = "BlendThumb.dll";
snprintf( snprintf(
RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL); RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL);
system(RegCmd); system(RegCmd);
# endif
RegCloseKey(root); RegCloseKey(root);
printf("success (%s)\n", usr_mode ? "user" : "system"); printf("success (%s)\n", usr_mode ? "user" : "system");

7
source/creator/CMakeLists.txt
View File

@ -990,6 +990,13 @@ elseif(WIN32)
DESTINATION "." DESTINATION "."
) )
if(WITH_BLENDER_THUMBNAILER)
install(
TARGETS BlendThumb
DESTINATION "."
)
endif()
if(WITH_DRACO) if(WITH_DRACO)
install( install(
PROGRAMS $<TARGET_FILE:extern_draco> PROGRAMS $<TARGET_FILE:extern_draco>