diff options
| -rwxr-xr-x | configure.py | 5 | ||||
| -rw-r--r-- | src/build-data/bakefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.py b/configure.py index daa29552c..abcaa6619 100755 --- a/configure.py +++ b/configure.py @@ -1854,6 +1854,8 @@ def create_template_vars(source_paths, build_config, options, modules, cc, arch, 'arch': options.arch, 'submodel': options.cpu, + 'bakefile_arch': 'x86' if options.arch == 'x86_32' else 'x86_64', + 'innosetup_arch': innosetup_arch(options.os, options.arch), 'mp_bits': choose_mp_bits(), @@ -2883,6 +2885,9 @@ def validate_options(options, info_os, info_cc, available_module_policies): if options.os != 'windows' or options.compiler != 'msvc' or options.build_shared_lib is False: raise UserError("Building via bakefile is only supported for MSVC DLL build") + if options.arch not in ['x86_64', 'x86_32']: + raise UserError("Bakefile only supports x86 targets") + # Warnings if options.os == 'windows' and options.compiler != 'msvc': logging.warning('The windows target is oriented towards MSVC; maybe you want cygwin or mingw') diff --git a/src/build-data/bakefile.in b/src/build-data/bakefile.in index 3e808faac..5592ec488 100644 --- a/src/build-data/bakefile.in +++ b/src/build-data/bakefile.in @@ -29,7 +29,7 @@ includedirs += build/include/external; libs += "%{i}"; %{endfor} -archs = %{arch}; +archs = %{bakefile_arch}; vs2013.option.ClCompile.DisableSpecificWarnings = "4250;4251;4275"; vs2013.option.ClCompile.WarningLevel = Level4; |