diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-25 17:45:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-25 17:45:45 +0300 |
| commit | e06eea4fbad2932dcceab99ee865ac02a6078129 (patch) | |
| tree | ca9f43d80b2e5e1808425722cb181de0c38c0ff9 /source/blender | |
| parent | 2cf20fde1b2f3494b8bd12e73fb9ccc17959f536 (diff) | |
fix for scons with recent change to how BINRELOC is enabled via cmake.
also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 57c4865dafd..00caf8cd01d 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -7,11 +7,12 @@ cflags='' incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu ../blenloader' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -defs = '' +defs = [] -if env['OURPLATFORM'] == 'linux2': +if env['WITH_BF_BINRELOC']: cflags='-pthread' incs += ' ../../../extern/binreloc/include' + defs.append('WITH_BINRELOC') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |