[Bf-blender-cvs] [7280321] master: Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX.

[Brecht Van Lommel]

Commit: 7280321f7a25bf7ec4b2ad9da676ac8b712a4c8a
Author: Brecht Van Lommel
Date:   Mon Jan 27 19:11:36 2014 +0100
https://developer.blender.org/rB7280321f7a25bf7ec4b2ad9da676ac8b712a4c8a

Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX.

Both need a better solution and break working builds.

===================================================================

M	intern/cycles/CMakeLists.txt
M	intern/cycles/SConscript

===================================================================

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 75e8b24..4e1a18a 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -90,6 +90,7 @@ include_directories(
 	${BOOST_INCLUDE_DIR}
 	${OPENIMAGEIO_INCLUDE_DIRS}
 	${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
+	${OPENEXR_INCLUDE_DIR}
 	${OPENEXR_INCLUDE_DIRS})
 
 # Subdirectories
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 2b97d54..efd4a88 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -103,7 +103,7 @@ optim_defs = defs[:]
 cycles_avx = cycles.Clone()
 avx_sources = [path.join('kernel', 'kernel_avx.cpp')]
 if env['OURPLATFORM'] == 'darwin': # always use Apple assembler for avx , gnu-compilers do not support it ( vanilla gcc-4.6 or higher case )
-    cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++')
+    cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags)
 else:
     cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags)