Commit: da523185fba54213b72c7cb6b8ecf7b369af1ccf
Author: Thomas Dinges
Date: Thu Jan 16 18:32:39 2014 +0100
https://developer.blender.org/rBda523185fba54213b72c7cb6b8ecf7b369af1ccf
Fix compilation of Cycles AVX kernel with cmake.
===================================================================
M intern/cycles/CMakeLists.txt
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index cc1f597..7d4254f 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -36,7 +36,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3
-msse4.1")
- set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3
-msse4.1 -mavx")
+ set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3
-msse4.1 -mavx")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
index 6f5f744..cbe0d4b 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -14,7 +14,7 @@ set(SRC
kernel.cpp
kernel_sse2.cpp
kernel_sse3.cpp
- kernel_sse41.cpp
+ kernel_sse41.cpp
kernel_avx.cpp
kernel.cl
kernel.cu
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
