From e4e78d475457ad86f5f29a0ccbd0090c2ba6b1d6 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 29 Mar 2011 13:00:03 +0000 Subject: Apply [#26044] Windows thumbnails and improved filetype registration submitted by Tom Edwards Fix [#25473] 64bit Windows installer for version 2.56 is not working patch submitted by Caleb (Dobz) The thumbnail patch adds a thumb handler DLL that adds .blend thumbnail support in Windows Explorer. A -r option is added to do registration in background. The patch also improves icon building and metadata for blender.exe. Caleb fixes and cleans up our installer to an acceptable state. The patch uses the new -r option to do the .blend extension and thumbnailer registration. Thanks to both Caleb and Tom for their efforts! --- source/icons/SConscript | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source/icons/SConscript') diff --git a/source/icons/SConscript b/source/icons/SConscript index ca6308781e9..4bb27a7d4fb 100644 --- a/source/icons/SConscript +++ b/source/icons/SConscript @@ -1,9 +1,12 @@ #!/usr/bin/python Import ('env') +import btools -if env['OURPLATFORM'] == 'linuxcross': - source = 'linuxcrossblender.rcscons' -else: - source = 'winblender.rcscons' +env['RCFLAGS'].append("-DWINDRES") +env['RCFLAGS'].append("-DBLEN_VER_RC_STR_M=" + btools.VERSION) +env['RCFLAGS'].append("-DBLEN_VER_RC_1=" + btools.VERSION[0]) +env['RCFLAGS'].append("-DBLEN_VER_RC_2=" + btools.VERSION[2]) +env['RCFLAGS'].append("-DBLEN_VER_RC_3=" + btools.VERSION[3]) +env['RCFLAGS'].append("-DBLEN_VER_RC_4=0") -env.BlenderRes('winresource', source, ['core'], priority=[95]) +env.BlenderRes('winresource', 'winblender.rc', ['core'], priority=[95]) -- cgit v1.2.3