Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks...
authorAntony Riakiotakis <kalast@gmail.com>
Wed, 25 Apr 2012 11:15:55 +0000 (11:15 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Wed, 25 Apr 2012 11:15:55 +0000 (11:15 +0000)
build_files/scons/tools/btools.py
release/windows/installer/00.sconsblender.nsi

index ca0ac2dd8da3bf39951a6d7ba35fe4609ad03985..efc80fcd3c58c9f4ffb947d4e27538162044cf46 100644 (file)
@@ -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()
index eb9b662910803681ebff26d111f1c66e27f91fe5..f6e5b783faabaadf3f47c9d85f42e4a4c6aba116 100644 (file)
@@ -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"