tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix T42966: Py_Initialize: Unable to get the locale encoding 

This only happened for SCons builds and caused by pure human stupidnes.
This commit is contained in:
Sergey Sharybin 2014-12-22 13:43:23 +05:00
parent 59a0c11ecc
commit cd4fedb285
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/SConscript
View File

@ -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') )

4
source/blender/blenlib/SConscript
View File

@ -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'