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
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-04-29 19:52:38 +0400
committerThomas Dinges <blender@dingto.org>2013-04-29 19:52:38 +0400
commitb13ef55973cfbd60d95069f4830d4777cc99a448 (patch)
treeb5d1c75fe50be2484e272720deed606f25702cc0 /intern
parentcabe929b2a3d6ec34abff49e07961cc1ceb39a15 (diff)
Cycles / SCons:
* Fast math compiler flag was set for Cycles, but not OSL.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/osl/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
index 09899567128..4685bb7753e 100644
--- a/intern/cycles/kernel/osl/SConscript
+++ b/intern/cycles/kernel/osl/SConscript
@@ -44,10 +44,10 @@ defs.append('CCL_NAMESPACE_END=}')
defs.append('WITH_OSL')
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
+ cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split())
incs.append(env['BF_PTHREADS_INC'])
defs.append('OSL_STATIC_LIBRARY')
else:
- cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
+ cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -ffast-math'.split())
env.BlenderLib ('cycles_kernel_osl', sources, incs, defs, libtype=['intern'], priority=[10], cxx_compileflags=cxxflags)