diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
commit | fd4575b2e3e47fb331ac6c9b30fb23cfb05a53ae (patch) | |
tree | fc22ef5086c488010fbc3d5058198d1686260562 /source/blender/editors/armature/SConscript | |
parent | 98f87b77f40b5617409ccc026be604fcaaff9f8e (diff) | |
parent | f9bffb3ca0ca88a7e774b0ee0da1d384707f0495 (diff) |
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/armature/SConscript')
-rw-r--r-- | source/blender/editors/armature/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index e9694bab63f..23e4da5ca41 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -8,7 +8,7 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include ../../bmesh' incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' -if env['OURPLATFORM'] == 'linux2': +if env['OURPLATFORM'] == 'linux': cflags='-pthread' incs += ' ../../../extern/binreloc/include' |