Mac :

- scons update to build with openCollada

- scons & cmake update for render optimization cflags

source/blender/render/CMakeLists.txt

@@ -47,6 +47,13 @@ IF(WITH_QUICKTIME)
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
+IF(APPLE)
+	IF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
+		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
+	ENDIF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+ENDIF(APPLE)
+
 #TODO
 #if env['OURPLATFORM']=='linux2':
 #    cflags='-pthread'

source/blender/render/SConscript

@@ -5,9 +5,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
 	# FIXME: need to set the appropriate flags for msvc, otherwise we get warnings
 	cflags = []
 	cxxflags = []
-else:
-	cflags = ['-O2','-msse2','-mfpmath=sse']
-	cxxflags = ['-O2','-msse2','-mfpmath=sse']
+
+if env['OURPLATFORM'] == 'darwin':
+	if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64'):
+		cflags = env['CFLAGS'] + ['-mfpmath=sse']
+		cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse']
+	else:
+		cflags = env['CFLAGS']
+		cxxflags = env['CXXFLAGS']
 
 sources = env.Glob('intern/source/*.c')
 raysources = env.Glob('intern/raytrace/*.cpp')