From 7ac4bd9105b93b621a3cb5715b1fc8bfa22c5867 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 25 Apr 2012 11:15:55 +0000 Subject: Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot! --- build_files/scons/tools/btools.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'build_files') 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() -- cgit v1.2.3