← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/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/render/SConscript
5
5
raysources = env.Glob('intern/raytrace/*.cpp')
6
6
 
7
7
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
8
 
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
9
 
incs += ' ../include ../blenloader ../../../intern/smoke/extern'
 
8
incs += ' extern/include ../blenkernel ../imbuf ../blenfont'
 
9
incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh'
10
10
 
11
11
cflags_raytrace = env['CCFLAGS']
12
12
cxxflags_raytrace = env['CXXFLAGS']
14
14
defs = []
15
15
defs_raytrace = []
16
16
 
 
17
if env['WITH_BF_SMOKE']:
 
18
    defs.append('WITH_SMOKE')
 
19
 
 
20
if env['WITH_BF_PYTHON']:
 
21
    incs += ' ../python'
 
22
    incs += ' ' + env['BF_PYTHON_INC']
 
23
    defs.append('WITH_PYTHON')
 
24
    if env['BF_DEBUG']:
 
25
        defs.append('DEBUG')
 
26
 
17
27
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
18
28
    if env['WITH_BF_RAYOPTIMIZATION']:
19
29
        cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
20
30
        cxxflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
21
31
 
22
 
if env['OURPLATFORM'] == 'win32-mingw':
 
32
if env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw'):
23
33
    if env['WITH_BF_RAYOPTIMIZATION']:
24
34
        cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
25
35
        cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
29
39
        cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
30
40
        cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
31
41
        
32
 
if env['OURPLATFORM'] == 'linux2':
 
42
if env['OURPLATFORM'] == 'linux':
33
43
    if env['WITH_BF_RAYOPTIMIZATION']:
34
44
        cflags_raytrace = env['CCFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
35
45
        cxxflags_raytrace = env['CXXFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
47
57
if env['WITH_BF_OPENEXR']:
48
58
    defs.append('WITH_OPENEXR')
49
59
 
50
 
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 
60
if env['WITH_BF_GAMEENGINE']:
 
61
    defs.append('WITH_GAMEENGINE')
 
62
 
 
63
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
51
64
    incs += ' ' + env['BF_PTHREADS_INC']
52
65
 
53
66
#