scons: Link libwesnoth_extras.a into wesnoth twice

Solves linker errors caused by hotkey/command_executor.o's newly-gained
dependency upon gui/dialogs/screenshot_notification.o.
This commit is contained in:
Ignacio R. Morelle 2014-02-15 03:23:24 -03:00
parent 47ffd9ea2d
commit d1635436c9

View file

@ -556,7 +556,7 @@ for env in [test_env, client_env, env]:
env.AddMethod(WesnothProgram)
wesnoth_objects = ["game.cpp", libwesnoth_extras, libwesnoth_core, libwesnoth_sdl,
libwesnoth, env["wesnoth_res"]]
libwesnoth, libwesnoth_extras, env["wesnoth_res"]]
if env["host"] in ["x86_64-nacl", "i686-nacl"]:
wesnoth_objects += [SConscript("nacl/SConscript")]
client_env.WesnothProgram("wesnoth", wesnoth_objects, have_client_prereqs)