Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1055)

Side by Side Diff: source/blender/editors/render/SConscript

Issue 7416049: Freestyle r54826 branch review Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Created 11 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # ***** BEGIN GPL LICENSE BLOCK ***** 3 # ***** BEGIN GPL LICENSE BLOCK *****
4 # 4 #
5 # This program is free software; you can redistribute it and/or 5 # This program is free software; you can redistribute it and/or
6 # modify it under the terms of the GNU General Public License 6 # modify it under the terms of the GNU General Public License
7 # as published by the Free Software Foundation; either version 2 7 # as published by the Free Software Foundation; either version 2
8 # of the License, or (at your option) any later version. 8 # of the License, or (at your option) any later version.
9 # 9 #
10 # This program is distributed in the hope that it will be useful, 10 # This program is distributed in the hope that it will be useful,
(...skipping 24 matching lines...) Expand all
35 incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' 35 incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
36 incs += ' ../../blenloader ../../bmesh' 36 incs += ' ../../blenloader ../../bmesh'
37 37
38 if env['OURPLATFORM'] == 'linux': 38 if env['OURPLATFORM'] == 'linux':
39 cflags='-pthread' 39 cflags='-pthread'
40 incs += ' ../../../extern/binreloc/include' 40 incs += ' ../../../extern/binreloc/include'
41 41
42 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', ' win64-mingw'): 42 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', ' win64-mingw'):
43 incs += ' ' + env['BF_PTHREADS_INC'] 43 incs += ' ' + env['BF_PTHREADS_INC']
44 44
45 if env['WITH_BF_FREESTYLE']:
46 incs += ' ../../freestyle'
47 env.Append(CFLAGS=['-DWITH_FREESTYLE'])
45 48
46 if env['WITH_BF_QUICKTIME']: 49 if env['WITH_BF_QUICKTIME']:
47 incs += ' ../../quicktime' 50 incs += ' ../../quicktime'
48 env.Append(CFLAGS=['-DWITH_QUICKTIME']) 51 env.Append(CFLAGS=['-DWITH_QUICKTIME'])
49 52
50 if env['USE_QTKIT']: 53 if env['USE_QTKIT']:
51 env.Append(CFLAGS=['-DUSE_QTKIT']) 54 env.Append(CFLAGS=['-DUSE_QTKIT'])
52 55
53 if env['OURPLATFORM'] == 'darwin': 56 if env['OURPLATFORM'] == 'darwin':
54 if env['WITH_BF_OPENMP']: 57 if env['WITH_BF_OPENMP']:
55 env.Append(CFLAGS=['-DPARALLEL=1']) 58 env.Append(CFLAGS=['-DPARALLEL=1'])
56 59
57 env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'] , priority=[45]) 60 env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'] , priority=[45])
OLDNEW

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b