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

Don't depend on boost::thread when not using libANA

Browse Source
This commit is contained in:
Alexander van Gessel 2013-05-22 02:52:53 +02:00
parent 4121b0780e
commit d412ac181b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -283,14 +283,13 @@ if env["prereqs"]:
conf.CheckLib("m")
conf.CheckFunc("round")
def CheckAsio(conf, do_check):
def CheckANA(conf, do_check):
if not do_check:
return True
if env["PLATFORM"] == 'win32':
conf.env.Append(LIBS = ["libws2_32"])
return conf.CheckBoost("system") and \
conf.CheckBoost("thread") and \
conf.CheckBoost("asio", header_only = True)
conf.CheckBoost("thread")
if env['host'] in ['x86_64-nacl', 'i686-nacl']:
# libppapi_cpp has a reverse dependency on the following function
@ -322,13 +321,14 @@ if env["prereqs"]:
conf.CheckBoost("smart_ptr", header_only = True) and \
conf.CheckSDL(require_version = '1.2.7') and \
conf.CheckSDL('SDL_net') and \
CheckAsio(conf, env["use_network_ana"]) or Warning("Base prerequisites are not met.")
CheckANA(conf, env["use_network_ana"]) or Warning("Base prerequisites are not met.")
env = conf.Finish()
client_env = env.Clone()
conf = client_env.Configure(**configure_args)
have_client_prereqs = have_server_prereqs and \
CheckAsio(conf, not env["use_network_ana"]) and \
conf.CheckBoost("system") and \
conf.CheckBoost("asio", header_only = True) and \
conf.CheckPango("cairo", require_version = "1.24.4") and \
conf.CheckPKG("fontconfig") and \
conf.CheckBoost("program_options", require_version="1.35.0") and \