diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
| commit | 219b472920998d763916c165816191bd8ae1f4a1 (patch) | |
| tree | d942c83359abf7cb1f0362afbbd543e3f72e38ee /source/blender/editors/object/SConscript | |
| parent | ed12e1978fec2eed33439f5e342cd84ef443d04e (diff) | |
| parent | 3b1585b1722efcf06ef9aa8f9d673047e68a7b9d (diff) | |
merge with trunk/2.5 at r25907
Diffstat (limited to 'source/blender/editors/object/SConscript')
| -rw-r--r-- | source/blender/editors/object/SConscript | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 9ac2b139330..d6da69f4a3a 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -6,9 +6,17 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' incs += ' ../../makesrna ../../python ../../ikplugin ../../bmesh' +incs += ' ../../render/extern/include ../../gpu' # for object_bake.c defs = [] +if env['OURPLATFORM'] == 'linux2': + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + if not env['WITH_BF_PYTHON']: defs.append('DISABLE_PYTHON') |