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

Side by Side Diff: source/blender/blenlib/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 19 matching lines...) Expand all
30 sources = env.Glob('intern/*.c') 30 sources = env.Glob('intern/*.c')
31 31
32 cflags='' 32 cflags=''
33 # don't add ../blenkernel back! 33 # don't add ../blenkernel back!
34 incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost' 34 incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost'
35 35
36 incs += ' ' + env['BF_FREETYPE_INC'] 36 incs += ' ' + env['BF_FREETYPE_INC']
37 incs += ' ' + env['BF_ZLIB_INC'] 37 incs += ' ' + env['BF_ZLIB_INC']
38 defs = [] 38 defs = []
39 39
40 if env['WITH_BF_FREESTYLE']:
41 defs.append('WITH_FREESTYLE')
42
40 if env['WITH_BF_BINRELOC']: 43 if env['WITH_BF_BINRELOC']:
41 cflags='-pthread' 44 cflags='-pthread'
42 incs += ' ../../../extern/binreloc/include' 45 incs += ' ../../../extern/binreloc/include'
43 defs.append('WITH_BINRELOC') 46 defs.append('WITH_BINRELOC')
44 47
45 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', ' win64-mingw'): 48 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', ' win64-mingw'):
46 incs += ' ' + env['BF_PTHREADS_INC'] 49 incs += ' ' + env['BF_PTHREADS_INC']
47 incs += ' ../../../intern/utfconv' 50 incs += ' ../../../intern/utfconv'
48 51
49 if env['OURPLATFORM'] == 'linuxcross': 52 if env['OURPLATFORM'] == 'linuxcross':
50 if env['WITH_BF_OPENMP']: 53 if env['WITH_BF_OPENMP']:
51 incs += ' ' + env['BF_OPENMP_INC'] 54 incs += ' ' + env['BF_OPENMP_INC']
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_blenlib', sources, Split(incs), Split(defs), libtype=['core ','player'], priority = [370,230], compileflags =cflags ) 60 env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core ','player'], priority = [370,230], compileflags =cflags )
OLDNEW

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