diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
| commit | ce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0 (patch) | |
| tree | c25f25286bde21fa170dc4a8582a12c19388f4e7 /source/blender/python/SConscript | |
| parent | 4c3140004aa61169061ddd2628a4f2c8d88f46a1 (diff) | |
| parent | 76e91d7a5f8c253543bd1c938c8e74872d7a6c81 (diff) | |
Merged changes in the trunk up to revision 38543.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 54fc9e7853d..bacd7550aef 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -1,6 +1,6 @@ #!/usr/bin/python -# TODO, split into 2 files. +# TODO, split into 3 files. Import ('env') @@ -19,7 +19,14 @@ 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 +env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [363,165]) # ketsji is 360 + + +# mathutils +defs = [] + +sources = env.Glob('mathutils/*.c') +env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # bpy |