← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/makesdna/SConscript

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesdna/SConscript
28
28
Import ('env')
29
29
 
30
30
objs = []
 
31
defs = []
31
32
 
32
33
o = SConscript('intern/SConscript')
33
34
objs += o
34
35
 
35
 
incs = '#/intern/guardedalloc .'
36
 
 
37
 
env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215,200] )
 
36
incs = [
 
37
    '.',
 
38
    '#/intern/guardedalloc',
 
39
    '../blenlib',
 
40
    ]
 
41
 
 
42
if env['WITH_BF_FREESTYLE']:
 
43
    defs.append('WITH_FREESTYLE')
 
44
 
 
45
env.BlenderLib('bf_dna', objs, incs, defs, libtype=['core', 'player'], priority = [215, 200])