Merge from trunk -r 25003:25745.

2010-01-05 19:21:59 +00:00
parent 06d548bd6f 73f84b24fc
commit 1bca8389dd
780 changed files with 73881 additions and 50790 deletions
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -167,6 +167,10 @@ BF_EXPAT_LIBPATH = '/usr/lib'

 WITH_BF_OPENMP = True

+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
 ##
 CC = 'gcc'
 CXX = 'g++'