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
path: root/tools
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-12-16 09:50:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2007-12-16 09:50:49 +0300
commit079d78f183e46615b59b93a2e32c2e85fabe190e (patch)
treef0c53935ad2047b7db458fb5ca3f839fc5d402b9 /tools
parentafb869fbe0ac591695d8faf5b98a782b3919ebc6 (diff)
* Added an option not to compile the 2.4x api (WITH_PYAPI_V24X for Makefiles and WITH_BF_PYAPI_V24X for scons)
* ghash wasnt being set to null when python stopped and was segfaulting on exit
Diffstat (limited to 'tools')
-rwxr-xr-xtools/btools.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/btools.py b/tools/btools.py
index 455335ab895..c29a27a44f5 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -46,7 +46,7 @@ def validate_arguments(args, bc):
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
- 'WITH_BF_FFMPEG',
+ 'WITH_BF_PYAPI_V24X',
'WITH_BF_PLAYER',
'CFLAGS', 'CCFLAGS', 'CPPFLAGS',
'REL_CFLAGS', 'REL_CCFLAGS',
@@ -173,6 +173,7 @@ def read_opts(cfg, args):
('BF_FFMPEG_INC', 'FFMPEG includes', ''),
('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),
+ (BoolOption('WITH_BF_PYAPI_V24X', 'Compile Blender 2.4x python api if true', 'true')),
(BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')),
('BF_JPEG', 'JPEG base path', ''),