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/windowmanager/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/windowmanager/SConscript')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index a613a5451b2..569eab10337 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -26,7 +26,7 @@ if env['WITH_BF_PYTHON']: if env['WITH_BF_COLLADA']: defs.append('WITH_COLLADA') -if env['OURPLATFORM'] == 'linux2': +if env['OURPLATFORM'] == 'linux': cflags='-pthread' incs += ' ../../../extern/binreloc/include' @@ -37,6 +37,6 @@ if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']: sources.remove('intern' + os.sep + 'wm_apple.c') if env['BF_BUILDINFO']: - defs.append('NAN_BUILDINFO') + defs.append('WITH_BUILDINFO') env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] ) |