Tamito Kajiyama
0ca96e1eb1
Conflicts resolved: source/blender/makesdna/intern/makesdna.c source/blender/makesrna/RNA_enum_types.h source/blender/render/intern/source/shadeinput.c source/blenderplayer/bad_level_call_stubs/stubs.c Additional changes: * source/blender/makesrna/intern/rna_linestyle.c: Fixed white space issues that generated a number of compiler errors. The problem was that two string literals for enumerating MA_RAMP_SOFT and MA_RAMP_LINEAR contained a space. The string literals are supposed to represent a valid C identifier because of their use for automatic code generation. * Stroke transparency has been temporarily disabled due to a functionality conflict with some merged changes. A fix of this issue is planned.
52 lines
1.5 KiB
Python
52 lines
1.5 KiB
Python
#!/usr/bin/python
|
|
|
|
# TODO, split into 3 files.
|
|
|
|
Import ('env')
|
|
|
|
incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes'
|
|
incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager'
|
|
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 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 = [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
|
|
defs = []
|
|
|
|
if is_debug:
|
|
defs.append('_DEBUG')
|
|
|
|
if env['WITH_BF_PYTHON_SAFETY']:
|
|
defs.append('WITH_PYTHON_SAFETY')
|
|
|
|
if env['BF_BUILDINFO']:
|
|
defs.append('BUILD_DATE')
|
|
|
|
if env['WITH_BF_INTERNATIONAL']:
|
|
defs.append('WITH_INTERNATIONAL')
|
|
|
|
if env['WITH_BF_CYCLES']:
|
|
defs.append('WITH_CYCLES')
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
|