diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
| commit | c98148a963d37fc2f25e125afeb4cf21df6fbf14 (patch) | |
| tree | 691a051e27f08e35bf09d35b6fb9c88e4c37b8d2 /source/blender/makesrna/SConscript | |
| parent | 0bba684d08952d0be822f3906ffb2a03b2674cc2 (diff) | |
| parent | fa63c297753636c149fbb1a3877d9b3d93601357 (diff) | |
=bmesh= merge from trunk at r36153
Diffstat (limited to 'source/blender/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 7f41fb758dd..9942420ae48 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -9,6 +9,7 @@ objs += o incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .' incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader' incs += ' ../render/extern/include ../bmesh' +incs += ' #/extern/glew/include' defs = [] @@ -54,6 +55,9 @@ if env['BF_UNIT_TEST']: if env['WITH_BF_PYTHON']: defs.append('WITH_PYTHON') +if env['WITH_BF_COLLADA']: + defs.append('WITH_COLLADA') + if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' |