[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45963] trunk/blender: Enable building of the installer with MinGW-w64, patch by Caleb Joseph ( Dobz) thanks a lot!

[Antony Riakiotakis]

Revision: 45963
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45963
Author:   psy-fi
Date:     2012-04-25 11:15:55 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot!

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/release/windows/installer/00.sconsblender.nsi

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2012-04-25 10:24:31 UTC (rev 45962)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-04-25 11:15:55 UTC (rev 45963)
@@ -665,12 +665,10 @@
     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 @@
     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()

Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- trunk/blender/release/windows/installer/00.sconsblender.nsi	2012-04-25 10:24:31 UTC (rev 45962)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi	2012-04-25 11:15:55 UTC (rev 45963)
@@ -90,7 +90,6 @@
 
   ${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"