diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-02 03:38:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-02 03:38:46 +0400 |
| commit | 56795262ad0dc3a168f31ca524b6c637907b1b50 (patch) | |
| tree | f42f86019751ae56b00d63c3702fcd4a812f5bcc /source/blender/windowmanager/SConscript | |
| parent | f5318bc04da743c7271245b6237e4ce80a855b7d (diff) | |
| parent | 81982140b862c07dc1a7ddc2ce995339b1eb4547 (diff) | |
svn merge -r37035:37078 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/windowmanager/SConscript')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 8e303a6d277..a613a5451b2 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -1,5 +1,6 @@ #!/usr/bin/python Import ('env') +import os sources = env.Glob('intern/*.c') @@ -33,7 +34,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']: - sources.remove('intern/wm_apple.c') + sources.remove('intern' + os.sep + 'wm_apple.c') if env['BF_BUILDINFO']: defs.append('NAN_BUILDINFO') |