diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-04 23:58:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-04 23:58:09 +0400 |
| commit | 5c395b69f55560e20c4c1f3e972b8e0759c647c2 (patch) | |
| tree | 445cda97cbf651b64bc55a0c12b2c0a77431d4aa /intern/cycles/SConscript | |
| parent | 04266c22254bb02cc030be04f1bd58cb3cf450fe (diff) | |
Fix for Luxrender boost::thread conflict, workaround now is to just not use it
in cycles and use pthreads instead.
Diffstat (limited to 'intern/cycles/SConscript')
| -rw-r--r-- | intern/cycles/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index bc9eb563e50..2ea224f052d 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -39,6 +39,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): else: cxxflags.append('-ffast-math'.split()) +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs.append(env['BF_PTHREADS_INC']) + # optimized kernel if env['WITH_BF_RAYOPTIMIZATION']: optim_cxxflags = [] |