← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/SConscript
4
4
sources = env.Glob('intern/*.c')
5
5
 
6
6
incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
7
 
incs += ' ../python ../render/extern/include #/intern/decimation/extern'
 
7
incs += ' ../render/extern/include #/intern/decimation/extern'
8
8
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
9
 
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 
9
incs += ' #/intern/iksolver/extern ../blenloader'
10
10
incs += ' #/extern/bullet2/src'
11
11
incs += ' #/intern/bmfont'
12
12
incs += ' #/intern/opennl/extern'
13
13
incs += ' ../gpu #/extern/glew/include'
14
14
 
15
 
incs += ' ' + env['BF_PYTHON_INC']
16
15
incs += ' ' + env['BF_OPENGL_INC']
17
16
incs += ' ' + env['BF_ZLIB_INC']
18
 
incs += ' ' + env['BF_SDL_INC']
19
 
 
20
 
defs = ''
 
17
 
 
18
defs = []
 
19
 
 
20
if not env['WITH_BF_PYTHON']:
 
21
        defs.append('DISABLE_PYTHON')
 
22
else:
 
23
        incs += ' ../python'
 
24
        incs += ' ' + env['BF_PYTHON_INC']
 
25
        if env['BF_DEBUG']:
 
26
                defs.append('_DEBUG')
 
27
 
 
28
if env['WITH_BF_QUICKTIME']:
 
29
        incs += ' ../quicktime'
 
30
 
 
31
if env['WITH_BF_SDL']:
 
32
        incs += ' ' + env['BF_SDL_INC']
 
33
else:
 
34
        defs.append('DISABLE_SDL')
21
35
 
22
36
if env['WITH_BF_INTERNATIONAL']:
23
 
        defs += 'WITH_FREETYPE2'
 
37
        defs.append('WITH_FREETYPE2')
24
38
 
25
39
if env['WITH_BF_VERSE']:
26
 
        defs += ' WITH_VERSE'
 
40
        defs.append('WITH_VERSE')
27
41
        incs += ' ' + env['BF_VERSE_INCLUDE']
28
42
 
29
43
if env['WITH_BF_VERSE']:
30
 
        defs += ' WITH_VERSE'
 
44
        defs.append('WITH_VERSE')
31
45
        
32
46
if env['WITH_BF_OPENEXR']:
33
 
    defs += ' WITH_OPENEXR'
 
47
        defs.append('WITH_OPENEXR')
 
48
 
 
49
if env['WITH_BF_OPENJPEG']:
 
50
        defs.append('WITH_OPENJPEG')
34
51
 
35
52
if env['WITH_BF_DDS']:
36
 
    defs += ' WITH_DDS'
 
53
        defs.append('WITH_DDS')
37
54
 
38
55
if env['WITH_BF_FFMPEG']:
39
 
    defs += ' WITH_FFMPEG'
40
 
    incs += ' ' + env['BF_FFMPEG_INC']
 
56
        defs.append('WITH_FFMPEG')
 
57
        incs += ' ' + env['BF_FFMPEG_INC']
41
58
 
42
59
if env['WITH_BF_QUICKTIME']:
43
 
    defs += ' WITH_QUICKTIME'
44
 
    incs += ' ' + env['BF_QUICKTIME_INC']
 
60
        defs.append('WITH_QUICKTIME')
 
61
        incs += ' ' + env['BF_QUICKTIME_INC']
 
62
 
 
63
if env['WITH_BF_BULLET']:
 
64
        defs.append('WITH_BULLET')
45
65
 
46
66
if env['BF_NO_ELBEEM']:
47
 
    defs += ' DISABLE_ELBEEM'
 
67
        defs.append('DISABLE_ELBEEM')
48
68
 
49
69
if env['WITH_BF_PLAYER']:
50
 
    SConscript(['bad_level_call_stubs/SConscript'])
 
70
        SConscript(['bad_level_call_stubs/SConscript'])
51
71
 
52
 
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
 
72
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [65, 20] )