0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove lua switch from scons,

Browse source 
...wesnoth doesn't compile without it and autotools and cmake have
already dropped the switch
This commit is contained in:
Alexander van Gessel 2010-02-06 18:13:11 +01:00
parent ee98475fa3
commit d75b0f8cff
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SConstruct
View file

@ -73,7 +73,6 @@ opts.AddVariables(
BoolVariable('editor', 'Enable editor', True),
BoolVariable('lowmem', 'Set to reduce memory usage by removing extra functionality', False),
BoolVariable('experimental', 'Enable experimental code for developers only', False),
BoolVariable('lua', 'Enable Lua support', True),
BoolVariable('notifications', 'Enable support for desktop notifications', True),
BoolVariable('nls','enable compile/install of gettext message catalogs',True),
PathVariable('prefix', 'autotools-style installation prefix', "/usr/local", PathVariable.PathAccept),
@ -294,19 +293,13 @@ if env["prereqs"]:
conf.CheckSDL(require_version = '1.2.7') and \
conf.CheckSDL('SDL_net') or Warning("Base prerequisites are not met.")
def check_lua():
if env["lua"]:
return conf.CheckLua(require_version = "5.1")
else:
return True
env = conf.Finish()
client_env = env.Clone()
conf = client_env.Configure(**configure_args)
have_client_prereqs = have_server_prereqs and \
conf.CheckPango("cairo") and \
conf.CheckPKG("fontconfig") and \
check_lua() and \
conf.CheckLua(require_version = "5.1") and \
conf.CheckBoost("regex", require_version = "1.35.0") and \
conf.CheckSDL("SDL_ttf", require_version = "2.0.8") and \
conf.CheckSDL("SDL_mixer", require_version = '1.2.0') and \
@ -403,9 +396,6 @@ for env in [test_env, client_env, env]:
if not env["editor"]:
env.Append(CPPDEFINES = "DISABLE_EDITOR")
if not env['lua']:
env.Append(CPPDEFINES = "DISABLE_LUA")
if env["PLATFORM"] == "win32":
env["pool_alloc"] = False