← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/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/gameengine/Converter/SConscript
2
2
Import ('env')
3
3
 
4
4
sources = env.Glob('*.cpp')
 
5
defs = []
5
6
 
6
7
incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
7
8
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
14
15
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic'
15
16
incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph'
16
17
incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde'
17
 
incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo'
18
 
incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
 
18
incs += ' #source/gameengine/Physics/Dummy'
 
19
incs += ' #source/gameengine/Network/LoopBackNetwork'
19
20
incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu'
20
21
 
 
22
if env['WITH_BF_SOLID']:
 
23
        incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/Fuzzics/include'
 
24
        incs += ' ' + env['BF_SOLID_INC']
 
25
        defs.append('USE_SUMO_SOLID')
 
26
 
21
27
incs += ' ' + env['BF_PYTHON_INC']
22
 
incs += ' ' + env['BF_SOLID_INC']
23
28
incs += ' ' + env['BF_BULLET_INC']
24
29
 
25
 
env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] )
 
30
env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['game','player'], priority=[5,70] )