Revision: 46612
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46612
Author:   psy-fi
Date:     2012-05-13 17:26:07 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Change the scons configuration for MinGW-w64 to be more in-line with cmake. 
Also deactivate openmp as it causes crashes when rendering with subsurf or 
multires modifiers

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win64-mingw-config.py

Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py        
2012-05-13 16:51:17 UTC (rev 46611)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py        
2012-05-13 17:26:07 UTC (rev 46612)
@@ -169,7 +169,8 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize']
 
-WITH_BF_OPENMP = True
+#Produces errors while rendering with subsurf/multires,
+WITH_BF_OPENMP = False
 
 ##
 CC = 'gcc'
@@ -178,10 +179,10 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 CXXFLAGS = [ '-fpermissive' ]
 
-CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', 
'-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', 
'-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-D_SSIZE_T_']
+CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', 
'-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', 
'-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize', '-mmmx', '-msse', 
'-msse2']
+REL_CCFLAGS = ['-DNDEBUG', '-O2', '-mmmx', '-msse', '-msse2', 
'-ftree-vectorize']
 
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', 
'-Wstrict-prototypes']
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to