diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
| commit | 2f453773f6b4cd0a03f5e2d9876ee250b87871f0 (patch) | |
| tree | 08c4bb2c1c3ee3fe5131e46a4e39b9224ba5c251 /SConstruct | |
| parent | 02fae3440c8b4b89aa0f9412bc4e0db60a787c13 (diff) | |
| parent | e1594ebb3c52f573a8a6c90f3d30acfb3de6e8a5 (diff) | |
Cycles: svn merge -r41266:41467 ^/trunk/blender
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 0db32365bfc..16ce8ca4b32 100644 --- a/SConstruct +++ b/SConstruct @@ -1,5 +1,5 @@ #!/usr/bin/env python -# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $ +# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -30,6 +30,8 @@ # Then read all SConscripts and build # # TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds. +# TODO: directory copy functions are far too complicated, see: +# http://wiki.blender.org/index.php/User:Ideasman42/SConsNotSimpleInstallingFiles import platform as pltfrm @@ -251,7 +253,9 @@ if 'blenderlite' in B.targets: target_env_defs['WITH_BF_BULLET'] = False target_env_defs['WITH_BF_BINRELOC'] = False target_env_defs['BF_BUILDINFO'] = False - target_env_defs['BF_NO_ELBEEM'] = True + target_env_defs['WITH_BF_FLUID'] = False + target_env_defs['WITH_BF_DECIMATE'] = False + target_env_defs['WITH_BF_BOOLEAN'] = False target_env_defs['WITH_BF_PYTHON'] = False target_env_defs['WITH_BF_3DMOUSE'] = False @@ -321,9 +325,9 @@ if 'blenderplayer' in B.targets: if 'blendernogame' in B.targets: env['WITH_BF_GAMEENGINE'] = False -# disable elbeem (fluidsim) compilation? -if env['BF_NO_ELBEEM'] == 1: - env['CPPFLAGS'].append('-DDISABLE_ELBEEM') +# build without elbeem (fluidsim)? +if env['WITH_BF_FLUID'] == 1: + env['CPPFLAGS'].append('-DWITH_MOD_FLUID') if btools.ENDIAN == "big": |