diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-08 22:37:24 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-08 22:37:24 +0400 |
commit | 4565944248175e84a2b3663202cae0c86fcee5b9 (patch) | |
tree | 708c4f90fd8910217a366371d04b027f8d2436d3 /source/blender/python/SConscript | |
parent | 98b18bc679388a2c036c9fed48a835ac71963b7f (diff) | |
parent | de4828036857e76141ca336997b99978ee09fb5f (diff) |
soc-2008-mxcurioni: merged changes to revision 16424, corrected compilation errors
Diffstat (limited to 'source/blender/python/SConscript')
-rw-r--r-- | source/blender/python/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 8612a9d6ca9..cb33f8437f1 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -6,6 +6,7 @@ sources = Split('BPY_interface.c BPY_menus.c') + env.Glob('api2_2x/*.c') incs = 'api2_2x ../blenkernel ../nodes ../blenlib ../blenloader' incs += ' ../render/extern/include ../radiosity/extern/include ../freestyle/intern/python' incs += ' ../makesdna #intern/guardedalloc #intern/bmfont ../imbuf ../include' +incs += ' #extern/glew/include ../gpu' incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_OPENGL_INC'] @@ -23,4 +24,7 @@ if env['WITH_BF_OPENEXR'] == 1: if env['WITH_BF_FFMPEG'] == 1: defs.append('WITH_FFMPEG') +if env['BF_BUILDINFO'] == 1: + defs.append('NAN_BUILDINFO') + env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] ) |