← Back to branch summary

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

« back to all changes in this revision

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

  • 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/blender/nodes/CMakeLists.txt
23
23
#
24
24
# ***** END GPL LICENSE BLOCK *****
25
25
 
26
 
FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c)
 
26
FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_nodes/*.c)
27
27
 
28
28
SET(INC 
29
29
  . ../../../intern/guardedalloc ../include ../blenlib ../makesdna
55
55
  ADD_DEFINITIONS(-DWITH_FFMPEG)
56
56
ENDIF(WITH_FFMPEG)
57
57
 
58
 
ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
59
 
 
60
58
BLENDERLIB(bf_nodes "${SRC}" "${INC}")
61
59
 
62
60
IF(WITH_VERSE)