diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-22 11:43:23 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-22 11:43:23 +0300 |
| commit | cd4fedb285a04b1f443623e8ae9548ddaef8088b (patch) | |
| tree | c4a7e083e95d71438f5bd00394bc9e86cd7f9b3d /source | |
| parent | 59a0c11ecc5bf3da563d6b012093027877e31e01 (diff) | |
Fix T42966: Py_Initialize: Unable to get the locale encoding
This only happened for SCons builds and caused by pure human stupidnes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 0484200709f..3da3d647275 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 55747a426f0..8b4054e00b5 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' |