Move game.cpp into common list of sources in scons.

since there's no need to override a setting for it anymore.
This commit is contained in:
Sergey Popov 2012-02-19 20:40:10 +00:00
parent 20bcf49f3e
commit a35f16c069

View file

@ -223,6 +223,7 @@ wesnoth_sources = Split("""
formula_function.cpp
formula_string_utils.cpp
formula_tokenizer.cpp
game.cpp
game_controller.cpp
game_controller_abstract.cpp
game_controller_new.cpp
@ -478,9 +479,7 @@ def WesnothProgram(env, target, source, can_build, **kw):
for env in [test_env, client_env, env]:
env.AddMethod(WesnothProgram)
game_cpp = client_env.Object("game.cpp");
wesnoth_objects = [game_cpp, libwesnoth_extras, libwesnoth_core, libwesnoth_sdl,
wesnoth_objects = [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl,
libwesnoth, env["wesnoth_res"]]
if env["host"] in ["x86_64-nacl", "i686-nacl"]:
wesnoth_objects += [SConscript("nacl/SConscript")]