diff options
-rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 9662d6fbff8..6584af085cd 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -102,7 +102,7 @@ #define AVG2(x, y) ( 0.5 * ((x) + (y)) ) -#define FTOCHAR(val) (val<=0.0f)? 0 : ((val>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*val)+0.5f)) +#define FTOCHAR(val) ((val)<=0.0f)? 0 : (((val)>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*(val))+0.5f)) #define VECCOPY(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);} #define VECCOPY2D(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1);} 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] ) diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 94a21cdd5df..b881b681ed9 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -27,7 +27,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +#ifndef DISABLE_PYTHON #include <Python.h> +#endif + #include <stdlib.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 1ff757a5823..d33721541f8 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -47,7 +47,7 @@ #include "BKE_global.h" #include "BKE_main.h" -#ifdef DISABLE_PYTHON +#ifndef DISABLE_PYTHON #include "BPY_extern.h" #endif |