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

« back to all changes in this revision

Viewing changes to intern/ghost/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
[ 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:
10
10
 
11
11
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
12
12
 
13
 
if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'):
 
13
if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):
14
14
    for f in pf:
15
15
        sources.remove('intern' + os.sep + f + 'Win32.cpp')
16
16
        sources.remove('intern' + os.sep + f + 'Carbon.cpp')