upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-22 05:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

scons: Make compiler and Boost version requirements match INSTALL

Browse Source
This commit is contained in:
Ignacio R. Morelle 2016-11-03 01:57:01 -03:00
parent b7ee27c8e7
commit 3c5332fd05
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SConstruct
View File

@ -183,6 +183,8 @@ if 'TRAVIS' in os.environ:
else: else:
SDL2_version = '2.0.4'; SDL2_version = '2.0.4';
boost_version = '1.48.0'
Help("""Arguments may be a mixture of switches and targets in any order. Help("""Arguments may be a mixture of switches and targets in any order.
Switches apply to the entire build regardless of where they are in the order. Switches apply to the entire build regardless of where they are in the order.
@ -377,15 +379,15 @@ if env["prereqs"]:
return conf.CheckBoost("locale") return conf.CheckBoost("locale")
have_server_prereqs = (\ have_server_prereqs = (\
conf.CheckCPlusPlus(gcc_version = "3.3") & \ conf.CheckCPlusPlus(gcc_version = "4.8") & \
conf.CheckBoost("iostreams", require_version = "1.34.1") & \ conf.CheckBoost("iostreams", require_version = boost_version) & \
conf.CheckBoostIostreamsGZip() & \ conf.CheckBoostIostreamsGZip() & \
conf.CheckBoostIostreamsBZip2() & \ conf.CheckBoostIostreamsBZip2() & \
CheckAsio(conf) & \ CheckAsio(conf) & \
conf.CheckBoost("random",require_version = "1.40.0") & \ conf.CheckBoost("random", require_version = boost_version) & \
conf.CheckBoost("smart_ptr", header_only = True) & \ conf.CheckBoost("smart_ptr", header_only = True) & \
conf.CheckBoost("system") & \ conf.CheckBoost("system") & \
conf.CheckBoost("filesystem", require_version = "1.44.0") & \ conf.CheckBoost("filesystem", require_version = boost_version) & \
have_i18n_prereqs() \ have_i18n_prereqs() \
and Info("GOOD: Base prerequisites are met")) \ and Info("GOOD: Base prerequisites are met")) \
or Warning("WARN: Base prerequisites are not met") or Warning("WARN: Base prerequisites are not met")
@ -401,7 +403,7 @@ if env["prereqs"]:
conf.CheckJPG() & \ conf.CheckJPG() & \
conf.CheckPango("cairo", require_version = "1.21.3") & \ conf.CheckPango("cairo", require_version = "1.21.3") & \
conf.CheckPKG("fontconfig") & \ conf.CheckPKG("fontconfig") & \
conf.CheckBoost("program_options", require_version="1.35.0") & \ conf.CheckBoost("program_options", require_version = boost_version) & \
conf.CheckBoost("thread") & \ conf.CheckBoost("thread") & \
conf.CheckBoost("regex") \ conf.CheckBoost("regex") \
or Warning("WARN: Client prerequisites are not met. wesnoth, cutter and exploder cannot be built") or Warning("WARN: Client prerequisites are not met. wesnoth, cutter and exploder cannot be built")