From f38511cbed143276fd1391e009a2f57025c19392 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 6 Jul 2010 09:19:52 +0000
Subject: [PATCH] === Windows Installer === * add info about bitness: 32bit,
 64bit or mingw-build

---
 release/windows/installer/00.sconsblender.nsi | 2 +-
 tools/btools.py                               | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 8bf30f9a48f..3b10477bffe 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -65,7 +65,7 @@ UninstallIcon "[RELDIR]\00.installer.ico"
 ;Data
 
 Caption "Blender [VERSION] Installer"
-OutFile "[DISTDIR]\..\blender-[VERSION]-windows.exe"
+OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"
 InstallDir "$PROGRAMFILES\Blender Foundation\Blender"
 
 BrandingText "Blender Foundation | http://www.blender.org"
diff --git a/tools/btools.py b/tools/btools.py
index 8a609ba31ba..03a1a0f0b7a 100644
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -457,6 +457,12 @@ def NSIS_Installer(target=None, source=None, env=None):
     if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc'):
         print "NSIS installer is only available on Windows."
         Exit()
+    if env['OURPLATFORM'] == 'win32-vc':
+        bitness = '32'
+    elif env['OURPLATFORM'] == 'win64-vc':
+        bitness = '64'
+    else:
+        bitness = '-mingw'
 
     start_dir = os.getcwd()
     rel_dir = os.path.join(start_dir,'release','windows','installer')
@@ -507,6 +513,7 @@ def NSIS_Installer(target=None, source=None, env=None):
     ns_cnt = string.replace(ns_cnt, "[VERSION]", version)
     ns_cnt = string.replace(ns_cnt, "[SHORTVERSION]", VERSION)
     ns_cnt = string.replace(ns_cnt, "[RELDIR]", os.path.normpath(rel_dir))
+    ns_cnt = string.replace(ns_cnt, "[BITNESS]", bitness)
 
     # do root
     rootlist = []