diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-12-17 08:40:40 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-12-17 08:40:40 +0300 |
| commit | 3c886d7c384289206b02b1581ddc9366d607bd3f (patch) | |
| tree | 700fab6f7001a2421ce981aa695f3ad81685d546 /source | |
| parent | 9776749438661c0476618d81918c15bd41347fc9 (diff) | |
* commit r17900 by Genscher was wrong.
- Instead of defining such defines for the entire codebase in Blender.py, add
the right checks and definitions to the places where it matters.
- Only check+set WITH_BULLET instead of also GAMEBLENDER=1
- NOTE: No global defines allowed in BlenderLib.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/src/SConscript | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index ab122e40bfc..4ab7d4a6792 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -53,6 +53,9 @@ if env['WITH_BF_QUICKTIME']: defs += ' WITH_QUICKTIME' incs += ' ' + env['BF_QUICKTIME_INC'] +if env['WITH_BF_BULLET']: + defs += ' WITH_BULLET' + if env['BF_NO_ELBEEM']: defs += ' DISABLE_ELBEEM' diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index dedb40485ef..451afc9b244 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -65,6 +65,9 @@ if env['WITH_BF_ICONV']: incs += ' ' + env['BF_ICONV_INC'] defs.append('WITH_ICONV') +if env['WITH_BF_GAMEENGINE']: + defs.append('GAMEBLENDER=1') + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] |