diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
| commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
| tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/blender/python/SConscript | |
| parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) | |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 7f8dd0e1227..ca742a3646a 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -1,30 +1,21 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('*.c') + env.Glob('api2_2x/*.c') +sources = env.Glob('intern/*.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 = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' +incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' +incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' incs += ' ' + env['BF_PYTHON_INC'] -incs += ' ' + env['BF_OPENGL_INC'] defs = [] -if env['OURPLATFORM'] in ('win32-mingw') and env['BF_DEBUG']: - defs.append('Py_TRACE_REFS') -if env['WITH_BF_QUICKTIME']: - incs += ' ' + env['BF_QUICKTIME_INC'] - defs.append('WITH_QUICKTIME') - -if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') +if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']: + defs.append('_DEBUG') -if env['WITH_BF_FFMPEG']: - defs.append('WITH_FFMPEG') +env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160]) -if env['BF_BUILDINFO']: - defs.append('NAN_BUILDINFO') -env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] ) +# generic +sources = env.Glob('generic/*.c') +env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360 |