diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-07-22 06:57:40 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-07-22 06:57:40 +0400 |
| commit | 69327f2ebd6dab06b3f75911ef7a28fd562994be (patch) | |
| tree | 18b8df7d8ac4106f85cb4a907f5edc566f453b7f /intern/elbeem | |
| parent | eecc3f51d4632aa028f6a4d550d43b6804db4aaa (diff) | |
| parent | d44d7e220dfbf7b0575ec93f1bb18777f4277eef (diff) | |
merge with trunk at r21785, and also fixed stupid ngon normals bug
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 92e80c36cea..0900ab1db5c 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -10,7 +10,7 @@ defs = 'NOGUI ELBEEM_BLENDER=1' if env['WITH_BF_OPENMP']: defs += ' PARALLEL' -if env['OURPLATFORM']=='win32-vc': +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): defs += ' USE_MSVC6FIXES' incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] incs += ' extern ' |