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

« back to all changes in this revision

Viewing changes to source/blender/src/CMakeLists.txt

  • 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:
1
 
# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
 
1
# $Id: CMakeLists.txt 16839 2008-09-30 05:05:50Z campbellbarton $
2
2
# ***** BEGIN GPL LICENSE BLOCK *****
3
3
#
4
4
# This program is free software; you can redistribute it and/or
35
35
  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
36
36
  ../quicktime ../../../intern/elbeem/extern
37
37
  ../../../intern/ghost ../../../intern/opennl/extern
38
 
  ../nodes
 
38
  ../nodes ../../../extern/glew/include ../gpu
39
39
  ${PYTHON_INC}
40
40
  ${SDL_INC}
41
41
)
80
80
  ADD_DEPENDENCIES(src mkprot verse)
81
81
ENDIF(WITH_VERSE)
82
82
 
 
83
IF(NOT WITH_ELBEEM)
 
84
  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 
85
ENDIF(NOT WITH_ELBEEM)