diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
| commit | 33efa9eeb63db672d9da97b68718aefb14b98f64 (patch) | |
| tree | aa3e0604a33ff8a498184615e52a607bba7241a6 /source/blender/python/SConscript | |
| parent | 29fafab10702d83954999342b9823eedc68fdea1 (diff) | |
| parent | a2b128aa359627cc1b6d464148cb3fbc30fd32b0 (diff) | |
Merged changes in the trunk up to revision 35367.
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index a226e66f3d7..885b61fb97e 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -1,7 +1,8 @@ #!/usr/bin/python -Import ('env') -sources = env.Glob('intern/*.c') +# TODO, split into 2 files. + +Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' @@ -9,17 +10,29 @@ incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] +is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']) + +# generic defs = [] -if env['BF_BUILDINFO']: - defs.append('BUILD_DATE') +if is_debug: + defs.append('_DEBUG') + +sources = env.Glob('generic/*.c') +env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360 -if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']: + +# bpy +defs = [] + +if is_debug: defs.append('_DEBUG') -env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160]) +if env['WITH_BF_PYTHON_SAFETY']: + defs.append('WITH_PYTHON_SAFETY') +if env['BF_BUILDINFO']: + defs.append('BUILD_DATE') -# generic -sources = env.Glob('generic/*.c') -env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360 +sources = env.Glob('intern/*.c') +env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160]) |