diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-02 18:26:28 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-02 18:26:28 +0400 |
| commit | efe4ea284abb33bbc0ab99e636decd3195c0e333 (patch) | |
| tree | 7bf6b3fa602b7fdf5b911ef3e650d1779be0684d /intern/cycles/SConscript | |
| parent | 1f96a120f6c7bb34a20e524cdd51b151f61c4b75 (diff) | |
Cycles:
* Fix broken compile of test app.
* Fix some warnings compiling with gcc for 32 bit.
* More tweaks to avoid extended precision issue from #29301.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 3299faa864a..bc9eb563e50 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -46,13 +46,14 @@ if env['WITH_BF_RAYOPTIMIZATION']: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split()) else: - optim_cxxflags.append('-ffast-math -msse -msse2 -msse3'.split()) + optim_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mfpmath=sse'.split()) - optim_defs = defs + ['WITH_OPTIMIZED_KERNEL'] + defs.append('WITH_OPTIMIZED_KERNEL') + optim_defs = defs[:] optim_sources = [path.join('kernel', 'kernel_optimized.cpp')] cycles_optim = cycles.Clone() - cycles_optim.BlenderLib('bf_intern_cycles_optimized', optim_sources, incs, optim_defs, libtype=['intern'], priority=[0], compileflags=[None], cxx_compileflags=optim_cxxflags) + cycles_optim.BlenderLib('bf_intern_cycles_optimized', optim_sources, incs, optim_defs, libtype=['intern'], priority=[10], compileflags=[None], cxx_compileflags=optim_cxxflags) cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], compileflags=[None], cxx_compileflags=cxxflags) |