diff options
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/gallium.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index a40a957191..925effc25d 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -155,7 +155,9 @@ def generate(env): # different scons versions building the same source file env['build'] = build_dir env.SConsignFile(os.path.join(build_dir, '.sconsign')) - env.CacheDir('build/cache') + if 'SCONS_CACHE_DIR' in os.environ: + print 'scons: Using build cache in %s.' % (os.environ['SCONS_CACHE_DIR'],) + env.CacheDir(os.environ['SCONS_CACHE_DIR']) env['CONFIGUREDIR'] = os.path.join(build_dir, 'conf') env['CONFIGURELOG'] = os.path.join(os.path.abspath(build_dir), 'config.log') @@ -177,8 +179,9 @@ def generate(env): '_WINDOWS', #'_UNICODE', #'UNICODE', - ('_WIN32_WINNT', '0x0501'), # minimum required OS version - ('WINVER', '0x0501'), + # http://msdn.microsoft.com/en-us/library/aa383745.aspx + ('_WIN32_WINNT', '0x0601'), + ('WINVER', '0x0601'), ] if msvc and env['toolchain'] != 'winddk': cppdefines += [ |