diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 12:45:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 12:45:55 +0400 |
| commit | 70bf00a74c1688e857e3ca1b143b4d7a57a30655 (patch) | |
| tree | 8015eb2525a1aeca9c77fcbdf8fe222fff67948d /source/blender/render/SConscript | |
| parent | dbe2fe5043b99f8a5717bbe5b6a9e36a6519f8c7 (diff) | |
| parent | f1cea89d99f0c80bdccd2ba1359142b5ff14cdb9 (diff) | |
svn merge ^/trunk/blender -r41200:41226 .
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index c5e21568220..99ff10d19eb 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -16,6 +16,13 @@ defs_raytrace = [] defs.append('WITH_SMOKE') # TODO, make optional +if env['WITH_BF_PYTHON']: + incs += ' ../python' + incs += ' ' + env['BF_PYTHON_INC'] + defs.append('WITH_PYTHON') + if env['BF_DEBUG']: + defs.append('DEBUG') + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['WITH_BF_RAYOPTIMIZATION']: cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] @@ -49,6 +56,9 @@ if env['WITH_BF_QUICKTIME']: if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') +if env['WITH_BF_GAMEENGINE']: + defs.append('WITH_GAMEENGINE') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |