← Back to branch summary

~diresu/blender/blender-command-port-002

« back to all changes in this revision

Viewing changes to source/blender/render/SConscript

  • Committer: Dietrich Bollmann
  • Date: 2010-07-23 08:21:44 UTC
  • mfrom: (15474.1.5025)
  • Revision ID: dietrich@formgames.org-20100723082144-24nrn8oku0115pwh
Update to state of blender repository from 2010-07-23 revision 30644.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/SConscript
8
8
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
9
9
incs += ' ../include ../blenloader ../../../intern/smoke/extern'
10
10
 
11
 
cflags = env['CCFLAGS']
12
 
cxxflags = env['CXXFLAGS']
 
11
cflags_raytrace = env['CCFLAGS']
 
12
cxxflags_raytrace = env['CXXFLAGS']
13
13
 
14
14
defs = []
 
15
defs_raytrace = []
15
16
 
16
17
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
17
18
    if env['WITH_BF_RAYOPTIMIZATION']:
18
 
        cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
19
 
        cxxflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
19
        cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
20
        cxxflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
20
21
 
21
22
if env['OURPLATFORM'] == 'win32-mingw':
22
23
    if env['WITH_BF_RAYOPTIMIZATION']:
23
 
        cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
24
 
        cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
24
        cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
25
        cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
25
26
 
26
27
if env['OURPLATFORM'] == 'darwin':
27
28
    if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64') and env['WITH_BF_RAYOPTIMIZATION']:
28
 
        cflags = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
29
 
        cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
29
        cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
30
        cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
30
31
        
31
32
if env['OURPLATFORM'] == 'linux2':
32
33
    if env['WITH_BF_RAYOPTIMIZATION']:
33
 
        cflags = env['CCFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
34
 
        cxxflags = env['CXXFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
34
        cflags_raytrace = env['CCFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
35
        cxxflags_raytrace = env['CXXFLAGS'] +  env['BF_RAYOPTIMIZATION_SSE_FLAGS']
35
36
    incs += ' ../../../extern/binreloc/include'
36
37
 
37
38
if env['OURPLATFORM'] == 'linuxcross':
38
39
    if env['WITH_BF_RAYOPTIMIZATION']:
39
 
        cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
40
 
        cxxflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
40
        cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
 
41
        cxxflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
41
42
 
42
43
if env['WITH_BF_QUICKTIME']:
43
44
    defs.append('WITH_QUICKTIME')
53
54
# HACK: To fix problem with error 'MMX instruction set not enabled' from mmintrin.h
54
55
#
55
56
if env['OURPLATFORM'] == 'linuxcross':
56
 
    defs.append('__MMX__')
 
57
    defs.append('__SSE__')
 
58
    defs_raytrace.append('__MMX__')
57
59
 
58
60
if env['WITH_BF_RAYOPTIMIZATION']:
59
61
    defs.append('__SSE__')
 
62
    defs_raytrace.append('__SSE__')
60
63
 
61
 
env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags )
62
 
env.BlenderLib ( libname = 'bf_render_raytrace', sources = raysources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags, cxx_compileflags=cxxflags )
 
64
env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145 )
 
65
env.BlenderLib ( libname = 'bf_render_raytrace', sources = raysources, includes = Split(incs), defines=defs_raytrace, libtype='core', priority=145, compileflags=cflags_raytrace, cxx_compileflags=cxxflags_raytrace )