Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-12 11:01:43 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-12-17 18:31:50 (GMT) |
| commit | 359799239fe61fae51a3a005e588af03a18d8a10 (patch) | |
| tree | 76c9649af448ca20bf6e76dcc9b50dc3d2d6e569 /BuildTools/SCons | |
| parent | 54b1a705c192c1c0afa3c71db393a275f25fc7ca (diff) | |
| download | swift-359799239fe61fae51a3a005e588af03a18d8a10.zip swift-359799239fe61fae51a3a005e588af03a18d8a10.tar.bz2 | |
Update SCons to version 2.4.0
Test-Information:
Tested build works with upcoming fixes with VS 2015
Community.
Change-Id: Ia4f78cc9efdae56ef78a2b7ae09f11fa1bd8bc37
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index babd585..b5cc6da 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -100,7 +100,7 @@ vars.Add(BoolVariable("experimental", "Build experimental features", "no")) vars.Add(BoolVariable("set_iterator_debug_level", "Set _ITERATOR_DEBUG_LEVEL=0", "yes")) vars.Add(BoolVariable("unbound", "Build bundled ldns and unbound. Use them for DNS lookup.", "no")) vars.Add(BoolVariable("check_headers", "Independently build compilation units for all Swiften headers for detecting missing dependencies.", "no")) - +vars.Add("win_target_arch", "Target architecture for Windows builds. x86 for 32-bit (default) or x86_64 for 64-bit.", "x86") vars.Add(BoolVariable("install_git_hooks", "Install git hooks", "true")) ################################################################################ @@ -115,8 +115,10 @@ env_ENV = { if "MSVC_VERSION" in ARGUMENTS : env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None)) + env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None), TARGET_ARCH=env["win_target_arch"]) else : env = Environment(ENV = env_ENV, variables = vars, platform = ARGUMENTS.get("PLATFORM", None)) + env = Environment(ENV = env_ENV, variables = vars, platform = ARGUMENTS.get("PLATFORM", None), TARGET_ARCH=env["win_target_arch"]) Help(vars.GenerateHelpText(env)) |