diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
| commit | feccbaabbd39c18b2f552964ebd8dfab4eeaed89 (patch) | |
| tree | 0069f654883a7a02dd320649ce61bd7933748111 /SConstruct | |
| parent | a22096e8019c461128a0907e4026859996ec1b5c (diff) | |
| parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) | |
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 0a91de4e410..a16805bbfaf 100644 --- a/SConstruct +++ b/SConstruct @@ -374,9 +374,10 @@ if btools.ENDIAN == "big": else: env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__') -# TODO, make optional +# TODO, make optional (as with CMake) env['CPPFLAGS'].append('-DWITH_AUDASPACE') env['CPPFLAGS'].append('-DWITH_AVI') +env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT') # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir B.root_build_dir = env['BF_BUILDDIR'] @@ -443,11 +444,12 @@ if env['WITH_BF_PYTHON']: found_pyconfig_h = True if not (found_python_h and found_pyconfig_h): - print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n" - " Set 'BF_PYTHON_INC' to point " - "to valid python include path(s).\n Containing " - "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") + print("""\nMissing: Python.h and/or pyconfig.h in "%s" + Set 'BF_PYTHON_INC' to point to valid include path(s), + containing Python.h and pyconfig.h for Python version "%s". + Example: python scons/scons.py BF_PYTHON_INC=../Python/include + """ % (env.subst('${BF_PYTHON_INC}'), env.subst('${BF_PYTHON_VERSION}'))) Exit() |