diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-09-07 03:26:36 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-09-07 03:26:36 +0400 |
commit | 9c6feb1987f46a8891de6c8155120026d9c7e792 (patch) | |
tree | cd4d4e0355ddb53f5615a4c7d1331bda56f6bca5 /source/blender/python/SConscript | |
parent | bc7fcc57f6eef9c1d6d5f52ca92591b45d54fb49 (diff) | |
parent | 99954545ee23dbeb932add263e94e34ed85c91d5 (diff) |
* Merged changes in the trunk up to revision 31789.
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
Diffstat (limited to 'source/blender/python/SConscript')
-rw-r--r-- | source/blender/python/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 7a0d14cf01d..a226e66f3d7 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -12,10 +12,10 @@ incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] defs = [] if env['BF_BUILDINFO']: - defs.append('BUILD_DATE') + defs.append('BUILD_DATE') if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']: - defs.append('_DEBUG') + defs.append('_DEBUG') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160]) |