diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-07-20 11:50:57 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-07-20 11:50:57 +0400 |
| commit | 456672efd0ee7c7fe27866347da56f6dd2480769 (patch) | |
| tree | e418631e41c023adddf17476ed4a85217215e83f /intern | |
| parent | 263670abb01bb5c4ea66ca561abfbed97936a9f5 (diff) | |
| parent | b76009232eea8d299fa2bec52c44dc76872705fb (diff) | |
svn merge with 2.5 branch from revision 21504 to 21713
Diffstat (limited to 'intern')
| -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 ' |