← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/gameengine/BlenderRoutines/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/BlenderRoutines/SConscript
15
15
incs += ' #source/gameengine/Physics/Bullet #source/gameengine/Physics/Sumo'
16
16
incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
17
17
incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader'
 
18
incs += ' #extern/glew/include #source/blender/gpu'
18
19
 
19
20
incs += ' ' + env['BF_PYTHON_INC']
20
21
incs += ' ' + env['BF_SOLID_INC']
25
26
if env['OURPLATFORM']=='win32-vc':
26
27
        cxxflags.append ('/GR')
27
28
 
28
 
if env['WITH_BF_GLEXT'] == 1:
29
 
        env['CPPFLAGS'].append('-DWITH_GLEXT')
30
 
 
31
29
env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)