[Bf-blender-cvs] [cd4fedb] master: Fix T42966: Py_Initialize: Unable to get the locale encoding

[Sergey Sharybin]

Commit: cd4fedb285a04b1f443623e8ae9548ddaef8088b
Author: Sergey Sharybin
Date:   Mon Dec 22 13:43:23 2014 +0500
Branches: master
https://developer.blender.org/rBcd4fedb285a04b1f443623e8ae9548ddaef8088b

Fix T42966: Py_Initialize: Unable to get the locale encoding

This only happened for SCons builds and caused by pure human stupidnes.

===================================================================

M	source/blender/blenkernel/SConscript
M	source/blender/blenlib/SConscript

===================================================================

diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 0484200..3da3d64 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -170,6 +170,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
     incs += ' ' + env['BF_PTHREADS_INC']
     incs += ' ../../../intern/utfconv'
 
+if env['WITH_BF_BINRELOC']:
+    incs += ' #extern/binreloc/include'
+    defs.append('WITH_BINRELOC')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [166,25]) #, cc_compileflags = env['CCFLAGS'].append('/WX') )
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 55747a4..8b4054e 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -44,10 +44,6 @@ incs = ' '.join(incs)
 
 defs = []
 
-if env['WITH_BF_BINRELOC']:
-    incs += ' ../../../extern/binreloc/include'
-    defs.append('WITH_BINRELOC')
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
     incs += ' ../../../intern/utfconv'