← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/render/SConscript

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/render/SConscript
7
7
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
8
8
incs += ' ../../gpu'
9
9
incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
10
 
incs += ' ../../blenloader'
 
10
incs += ' ../../blenloader ../../bmesh'
11
11
 
12
 
if env['OURPLATFORM'] == 'linux2':
 
12
if env['OURPLATFORM'] == 'linux':
13
13
    cflags='-pthread'
14
14
    incs += ' ../../../extern/binreloc/include'
15
15
 
16
 
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 
16
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
17
17
    incs += ' ' + env['BF_PTHREADS_INC']
18
18
 
19
19