diff options
| -rw-r--r-- | build_files/scons/tools/btools.py | 8 | ||||
| -rw-r--r-- | release/windows/installer/00.sconsblender.nsi | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index ca0ac2dd8da..efc80fcd3c5 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -665,12 +665,10 @@ def NSIS_Installer(target=None, source=None, env=None): if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): print "NSIS installer is only available on Windows." Exit() - if env['OURPLATFORM'] == 'win32-vc': + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): bitness = '32' - elif env['OURPLATFORM'] == 'win64-vc': + elif env['OURPLATFORM'] in ('win64-vc', 'win64-mingw'): bitness = '64' - else: - bitness = '-mingw' start_dir = os.getcwd() rel_dir = os.path.join(start_dir,'release','windows','installer') @@ -762,7 +760,7 @@ def NSIS_Installer(target=None, source=None, env=None): cmdline = "makensis " + "\""+tmpnsi+"\"" startupinfo = subprocess.STARTUPINFO() - startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW + #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, startupinfo=startupinfo, shell = True) data, err = proc.communicate() diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi index eb9b6629108..f6e5b783faa 100644 --- a/release/windows/installer/00.sconsblender.nsi +++ b/release/windows/installer/00.sconsblender.nsi @@ -90,7 +90,6 @@ Function .onInit ${If} ${RunningX64} ${If} "[BITNESS]" == "32" - ${OrIf} "[BITNESS]" == "-mingw" StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section ${ElseIf} "[BITNESS]" == "64" StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender" |