Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-01-16 21:32:39 +0400
committerThomas Dinges <blender@dingto.org>2014-01-16 21:32:54 +0400
commitda523185fba54213b72c7cb6b8ecf7b369af1ccf (patch)
treecaaceb97f8b7b108024d60589c183de37df346d7
parent6fdf78eaf6360d857f3253726de34375339da6c2 (diff)
Fix compilation of Cycles AVX kernel with cmake.
-rw-r--r--intern/cycles/CMakeLists.txt2
-rw-r--r--intern/cycles/kernel/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index cc1f5978dc1..7d4254fa5d4 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 6f5f744e311..cbe0d4b5d10 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