Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix to allow several include dirs for python under scons build system (needed with new py3.3 debian-like packages).

Browse Source
This commit is contained in:
Bastien Montagne
2012-11-12 18:31:15 +00:00
parent f0caab41b2
commit e811a2d0ff
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SConstruct
View File

@@ -422,16 +422,22 @@ if not quickie and do_clean:
# with _any_ library but since we used a fixed python version this tends to # with _any_ library but since we used a fixed python version this tends to
# be most problematic. # be most problematic.
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h") found_python_h = found_pyconfig_h = False
for bf_python_inc in env.subst('${BF_PYTHON_INC}').split():
py_h = os.path.join(Dir(bf_python_inc).abspath, "Python.h")
if os.path.exists(py_h):
found_python_h = True
py_h = os.path.join(Dir(bf_python_inc).abspath, "pyconfig.h")
if os.path.exists(py_h):
found_pyconfig_h = True
if not os.path.exists(py_h): if not (found_python_h and found_pyconfig_h):
print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n" print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n"
" Set 'BF_PYTHON_INC' to point " " Set 'BF_PYTHON_INC' to point "
"to a valid python include path.\n Containing " "to valid python include path(s).\n Containing "
"Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
Exit() Exit()
del py_h
if not os.path.isdir ( B.root_build_dir): if not os.path.isdir ( B.root_build_dir):

2
intern/cycles/SConscript
View File

@@ -32,7 +32,7 @@ incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.sp
incs.extend('#extern/glew/include #intern/mikktspace'.split()) incs.extend('#extern/glew/include #intern/mikktspace'.split())
incs.append(cycles['BF_OIIO_INC']) incs.append(cycles['BF_OIIO_INC'])
incs.append(cycles['BF_BOOST_INC']) incs.append(cycles['BF_BOOST_INC'])
incs.append(cycles['BF_PYTHON_INC']) incs.extend(cycles['BF_PYTHON_INC'].split())
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split()) cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())

2
intern/locale/SConscript
View File

@@ -11,4 +11,4 @@ if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL') defs.append('WITH_INTERNATIONAL')
incs += ' ' + env['BF_BOOST_INC'] incs += ' ' + env['BF_BOOST_INC']
env.BlenderLib( 'bf_intern_locale', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) env.BlenderLib( 'bf_intern_locale', sources, Split(incs), defs, libtype=['intern','player'], priority=[10, 185])