← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/imbuf/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/blender/imbuf/SConscript
17
17
        defs.append('WITH_VERSE')
18
18
        incs += ' ' + env['BF_VERSE_INCLUDE']
19
19
        
20
 
if env['WITH_BF_OPENEXR'] == 1:
 
20
if env['WITH_BF_OPENEXR']:
21
21
    defs.append('WITH_OPENEXR')
22
22
 
23
 
if env['WITH_BF_DDS'] == 1:
 
23
if env['WITH_BF_DDS']:
24
24
    defs.append('WITH_DDS')
25
25
 
26
 
if env['WITH_BF_FFMPEG'] == 1:
 
26
if env['WITH_BF_FFMPEG']:
27
27
    defs.append('WITH_FFMPEG')
28
28
    incs += ' ' + env['BF_FFMPEG_INC']
29
29
 
30
 
if env['WITH_BF_QUICKTIME']==1:
 
30
if env['WITH_BF_OPENJPEG']:
 
31
    defs.append('WITH_OPENJPEG')
 
32
    incs += ' ' + env['BF_OPENJPEG_INC']
 
33
 
 
34
if env['WITH_BF_REDCODE']:
 
35
    defs.append('WITH_REDCODE')
 
36
    incs += ' ' + env['BF_REDCODE_INC']
 
37
 
 
38
if env['WITH_BF_QUICKTIME']:
31
39
        incs += ' ' + env['BF_QUICKTIME_INC']
32
40
        defs.append('WITH_QUICKTIME')
33
41