diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
| commit | 9ca7f6659f5f316392901fc9607a0dc4e2e373b4 (patch) | |
| tree | 1cf3771a0a4e756baee494da0818d4dd08cc9ce9 /source/blender/python/SConscript | |
| parent | 9f243d531cb2629625d02e4290549b9e6ba76933 (diff) | |
| parent | 2d8227f20400767bcf0fbb0877a055534d8a99ff (diff) | |
Merged changes in the trunk up to revision 44419.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index e9c8d50ef85..a755c916ef3 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -5,13 +5,19 @@ Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes' -incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager' +incs += ' ../imbuf ../blenloader ../bmesh ../gpu ../render/extern/include ../windowmanager' incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']) +# bmesh +defs = [] + +sources = env.Glob('bmesh/*.c') +env.BlenderLib( libname = 'bf_python_bmesh', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) + # generic defs = [] |