Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.

Thanks!

7 files changed, 10 insertions, 10 deletions

diff --git a/intern/SConscript b/intern/SConscript
index d7c3715349b..b6305f7dbab 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -36,5 +36,5 @@ if NEW_CSG == 'false':
 else:
     SConscript(['csg/SConscript'])
 
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
     SConscript(['utfconv/SConscript'])
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index b8d5a56a625..50c81db46dd 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -41,7 +41,7 @@ if env['WITH_BF_PYTHON']:
     incs += ' Python ' + env['BF_PYTHON_INC']
     defs.append('WITH_PYTHON')
 
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
index 1c8c912614d..f630d1d58e0 100644
--- a/intern/boolop/SConscript
+++ b/intern/boolop/SConscript
@@ -18,13 +18,13 @@ else:
     if env['WITH_BF_BOOST']:
         if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
             # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-            if env['OURPLATFORM'] != 'win32-mingw':
+            if env['OURPLATFORM'] not in ('win32-mingw', 'win64-mingw'):
                 defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
         defs.append('CARVE_SYSTEM_BOOST')
         incs +=  ' ' + env['BF_BOOST_INC']
 
-if (env['OURPLATFORM'] == 'win32-mingw'):
+if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
     env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 else:
     env.BlenderLib ('bf_intern_bop', sources, Split(incs) , defs, libtype='intern', priority = 5 )
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 2ea224f052d..34c6e8df2fd 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -39,7 +39,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 else:
     cxxflags.append('-ffast-math'.split())
 
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs.append(env['BF_PTHREADS_INC'])
 
 # optimized kernel
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 2265daa8fff..44882a64286 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -49,7 +49,7 @@ elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'f
     else:
         sources.remove('intern' + os.sep + 'GHOST_DropTargetX11.cpp')
 
-elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
+elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
     for f in pf:
         try:
             sources.remove('intern' + os.sep + f + 'X11.cpp')
@@ -98,7 +98,7 @@ if env['WITH_BF_3DMOUSE']:
 else:
     sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')
     try:
-        if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
+        if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
             sources.remove('intern' + os.sep + 'GHOST_NDOFManagerWin32.cpp')
         elif window_system=='darwin':
             sources.remove('intern' + os.sep + 'GHOST_NDOFManagerCocoa.mm')
@@ -108,7 +108,7 @@ else:
         pass
 
 
-if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
+if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs = env['BF_WINTAB_INC'] + ' ' + incs
     incs += ' ../utfconv'
 
diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript
index 502df1891d5..711955cbfeb 100644
--- a/intern/opennl/SConscript
+++ b/intern/opennl/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
 
 incs = 'extern superlu ../../extern/colamd/Include'
 
-if (env['OURPLATFORM'] == 'win32-mingw'):
+if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
     env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
 else:
     env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core'], priority=[55] )
diff --git a/intern/utfconv/SConscript b/intern/utfconv/SConscript
index 010fcf9aa7c..19a698b6a0b 100644
--- a/intern/utfconv/SConscript
+++ b/intern/utfconv/SConscript
@@ -9,7 +9,7 @@ defs = ''
 # This is odd but leave it for now...
 # Why have win32 check here? - this is only used for windows.
 # ... because one day we might want to use it on other platforms.
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
 	sources += ['utf_winfunc.c']
 
 env.BlenderLib('bf_utfconv', sources, Split(incs), Split(defs), libtype=['intern','player'], priority=[0,0])