diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-10-29 19:49:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-10-29 19:49:51 +0300 |
| commit | 22bcbc574265e9385b3dd59e28f063b716c338a7 (patch) | |
| tree | 57ed5462e7378e9027fd1aba3a0c07532c476575 /source/blender/blenkernel/SConscript | |
| parent | 481831bd27b69b5afa6b54dab1e18bf5c8d27f6e (diff) | |
fix for more disable python defines,
FTOCHAR didnt have brackets around the value. FTOCHAR(a+b) didnt work, FTOCHAR((a+b)) did.
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 9b7e6736033..4c5cd51b836 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna' -incs += ' ../python ../render/extern/include #/intern/decimation/extern' +incs += ' ../render/extern/include #/intern/decimation/extern' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' #/intern/iksolver/extern ../blenloader ../quicktime' incs += ' #/extern/bullet2/src' @@ -12,7 +12,6 @@ incs += ' #/intern/bmfont' incs += ' #/intern/opennl/extern' incs += ' ../gpu #/extern/glew/include' -incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_SDL_INC'] @@ -21,6 +20,9 @@ defs = '' if not env['WITH_BF_PYTHON']: defs += 'DISABLE_PYTHON' +else: + incs += ' ../python' + incs += ' ' + env['BF_PYTHON_INC'] if env['WITH_BF_INTERNATIONAL']: defs += ' WITH_FREETYPE2' @@ -52,7 +54,4 @@ if env['BF_NO_ELBEEM']: if env['WITH_BF_PLAYER']: SConscript(['bad_level_call_stubs/SConscript']) -if not env['WITH_BF_PYTHON']: - defs += ' DISABLE_PYTHON' - env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) |