From 66ec72045f8c25ec9e9710f4d70aed9fb1514df6 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 30 Aug 2019 08:40:08 -0600 Subject: Windows: Move building of blendthumb into the blender codebase. Previously this was done in the deps builder due to the fact we needed both 32 and 64 bit versions of this dll and CMAKE does not support that in a single build folder. Now that 32 bit support has been dropped, this can be safely moved into the codebase. Reviewers: brecht Differential Revision: https://developer.blender.org/D5633 --- source/blender/blenlib/intern/winstuff.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 9e6ea0bb6ee..724f27f4667 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -172,17 +172,7 @@ void RegisterBlendExtension(void) BLI_getInstallationDir(InstallDir); GetSystemDirectory(SysDir, FILE_MAXDIR); -# ifdef _WIN64 - ThumbHandlerDLL = "BlendThumb64.dll"; -# else - IsWow64Process(GetCurrentProcess(), &IsWOW64); - if (IsWOW64 == true) { - ThumbHandlerDLL = "BlendThumb64.dll"; - } - else { - ThumbHandlerDLL = "BlendThumb.dll"; - } -# endif + ThumbHandlerDLL = "BlendThumb.dll"; snprintf( RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL); system(RegCmd); -- cgit v1.2.3