Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2006-10-18 09:45:47 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2006-10-18 09:45:47 +0400
commit88446eeca4b6f9d31928a538e3a39d04f1d06976 (patch)
tree069b6135aa98b631a1e37485562190bd0428d084 /source/blender/src/SConscript
parent134e5622193cd4eb168b0457208ed6794b5935df (diff)
Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users). Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due to this. - this commit also has a few whitespace changes and - made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
Diffstat (limited to 'source/blender/src/SConscript')
-rw-r--r--source/blender/src/SConscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 0663cb01c5d..2e0f632ca85 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -20,6 +20,9 @@ incs += ' ' + env['BF_OPENGL_INC']
defs = []
+if env['WITH_BF_YAFRAY'] == 0:
+ defs.append('DISABLE_YAFRAY')
+
if env['WITH_BF_INTERNATIONAL'] == 1:
incs += ' ../ftfont'
defs.append('INTERNATIONAL')
@@ -37,8 +40,8 @@ if env['WITH_BF_FFMPEG'] == 1:
incs += ' ' + env['BF_FFMPEG_INC']
if env['WITH_BF_VERSE']:
- defs.append('WITH_VERSE')
- incs += ' ' + env['BF_VERSE_INCLUDE']
+ defs.append('WITH_VERSE')
+ incs += ' ' + env['BF_VERSE_INCLUDE']
# TODO buildinfo
if env['BF_BUILDINFO'] == 1: