diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-02 03:52:56 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-27 12:08:27 +0400 |
| commit | 72ac596e19ddb37636e107635b52ee78888460e7 (patch) | |
| tree | 5b94775ba0528366a07114c8d47859f485c725e0 /SConstruct | |
| parent | 0a0e4e0e698eb496c4fb18c79b532104581ce0af (diff) | |
Update Ceres to latest upstream version
Brings new bounds limiting and also prepares build system
for the changes in the upstream.
Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.
This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D581
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 0c85fe11cdc..bdb9b3a8bfb 100644 --- a/SConstruct +++ b/SConstruct @@ -40,11 +40,13 @@ import string import shutil import re -# store path to tools +# store path to tools and modules toolpath=os.path.join(".", "build_files", "scons", "tools") +modulespath=os.path.join(".", "build_files", "scons", "Modules") -# needed for importing tools +# needed for importing tools and modules sys.path.append(toolpath) +sys.path.append(modulespath) import Blender import btools @@ -176,6 +178,16 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'): env['OURPLATFORM'] = platform +# Put all auto configuration run-time tests here + +from FindSharedPtr import FindSharedPtr +from FindUnorderedMap import FindUnorderedMap + +conf = Configure(env) +FindSharedPtr(conf) +FindUnorderedMap(conf) +env = conf.Finish() + configfile = os.path.join("build_files", "scons", "config", platform + "-config.py") if os.path.exists(configfile): |