Switch scons to use internal lua.

This commit is contained in:
Sergey Popov 2010-07-30 12:04:28 +00:00
parent b9f25ba7b2
commit 725c567339
3 changed files with 39 additions and 2 deletions

View File

@ -306,7 +306,6 @@ if env["prereqs"]:
have_client_prereqs = have_server_prereqs and \
conf.CheckPango("cairo") and \
conf.CheckPKG("fontconfig") 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 \

View File

@ -421,6 +421,9 @@ if env["editor"]:
wesnoth_sources += wesnoth_editor_sources
libwesnoth_extras = client_env.Library("wesnoth_extras", wesnoth_sources)
lua = SConscript("lua/SConscript")
#
# Target declarations
#
@ -447,7 +450,7 @@ for env in [test_env, client_env, env]:
game_cpp = client_env.Object("game.cpp", EXTRA_DEFINE = not env["pool_alloc"] and "DISABLE_POOL_ALLOC" or None);
client_env.WesnothProgram("wesnoth", [game_cpp] + [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth, env["wesnoth_res"]], have_client_prereqs)
client_env.WesnothProgram("wesnoth", [game_cpp] + [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth, lua, env["wesnoth_res"]], have_client_prereqs)
campaignd_sources = Split("""
server/input_stream.cpp

35
src/lua/SConscript Normal file
View File

@ -0,0 +1,35 @@
# vi: syntax=python:et:ts=4
Import("env")
lua_sources = Split("""
lapi.c
lcode.c
ldebug.c
ldo.c
ldump.c
lfunc.c
lgc.c
llex.c
lmem.c
lobject.c
lopcodes.c
lparser.c
lstate.c
lstring.c
ltable.c
ltm.c
lundump.c
lvm.c
lzio.c
lauxlib.c
lbaselib.c
ldblib.c
liolib.c
lmathlib.c
loslib.c
ltablib.c
lstrlib.c
loadlib.c
linit.c
""")
liblua = env.Library("lua", lua_sources, CCCOM = env["CXXCOM"], CPPPATH = [Dir(".").srcnode()])
Return("liblua")