From 101e5d36ef3c799bf43668cdd901f2e4080914c3 Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Thu, 9 Jun 2016 12:04:27 +0300 Subject: [PATCH] scons: remove SDL_net dependency from unit tests --- SConstruct | 2 +- src/SConscript | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index b920ee328d7d..ebc4bd74d6c1 100755 --- a/SConstruct +++ b/SConstruct @@ -457,7 +457,7 @@ if env["prereqs"]: test_env = client_env.Clone() conf = test_env.Configure(**configure_args) - have_test_prereqs = have_client_prereqs and conf.CheckBoost('unit_test_framework') and conf.CheckSDL("SDL2_net", header_file = "SDL_net") \ + have_test_prereqs = have_client_prereqs and conf.CheckBoost('unit_test_framework') \ or Warning("WARN: Unit tests are disabled because their prerequisites are not met") test_env = conf.Finish() if not have_test_prereqs and "test" in env["default_targets"]: diff --git a/src/SConscript b/src/SConscript index f2e4441b4b23..fc39e6133b4d 100644 --- a/src/SConscript +++ b/src/SConscript @@ -22,7 +22,6 @@ libwesnoth_core_sources = Split(""" map/map.cpp md5.cpp mt_rng.cpp - network.cpp seed_rng.cpp serialization/binary_or_text.cpp serialization/parser.cpp @@ -40,8 +39,6 @@ libwesnoth_core_sources = Split(""" version.cpp """) -libwesnoth_core_sources.extend(campaignd_env.Object("network_worker.cpp", EXTRA_DEFINE = env['raw_sockets'] and "NETWORK_USE_RAW_SOCKETS" or None)) - game_config_env = campaignd_env.Clone() filesystem_env = campaignd_env.Clone() if env["PLATFORM"] != "win32": @@ -631,6 +628,8 @@ campaignd_sources = Split(""" campaign_server/addon_utils.cpp campaign_server/blacklist.cpp server/input_stream.cpp + network.cpp + network_worker.cpp """) if env["PLATFORM"] == "win32": env["fifodir"] = "" @@ -716,7 +715,6 @@ test_sources = Split(""" tests/test_make_enum.cpp tests/test_map_location.cpp tests/test_mp_connect.cpp - tests/test_network_worker.cpp tests/test_recall_list.cpp tests/test_rng.cpp tests/test_sdl_utils.cpp