Merge pull request #6557 from wesnoth/minor_req_cleanup
Minor req cleanup
This commit is contained in:
commit
ae79f74e2e
7 changed files with 3 additions and 12 deletions
|
@ -90,7 +90,7 @@ if(WIN32)
|
||||||
set(wesnoth_core_sources ${wesnoth_core_sources} log_windows.cpp)
|
set(wesnoth_core_sources ${wesnoth_core_sources} log_windows.cpp)
|
||||||
set(wesnoth_game_sources ${wesnoth_game_sources} desktop/windows_tray_notification.cpp desktop/windows_battery_info.cpp)
|
set(wesnoth_game_sources ${wesnoth_game_sources} desktop/windows_tray_notification.cpp desktop/windows_battery_info.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set_source_files_properties(${lua_sources} PROPERTIES COMPILE_FLAGS "/FI\"${wesnoth_lua_config}\"")
|
set_source_files_properties(${lua_sources} PROPERTIES COMPILE_FLAGS "/FI\"${wesnoth_lua_config}\"")
|
||||||
# silence an implicit bitshift conversion warning
|
# silence an implicit bitshift conversion warning
|
||||||
|
@ -185,7 +185,6 @@ if(ENABLE_GAME)
|
||||||
Boost::program_options
|
Boost::program_options
|
||||||
Boost::regex
|
Boost::regex
|
||||||
Boost::system
|
Boost::system
|
||||||
Boost::thread
|
|
||||||
Boost::random
|
Boost::random
|
||||||
Boost::coroutine
|
Boost::coroutine
|
||||||
Boost::locale
|
Boost::locale
|
||||||
|
@ -232,7 +231,6 @@ if(ENABLE_TESTS)
|
||||||
Boost::program_options
|
Boost::program_options
|
||||||
Boost::regex
|
Boost::regex
|
||||||
Boost::system
|
Boost::system
|
||||||
Boost::thread
|
|
||||||
Boost::random
|
Boost::random
|
||||||
Boost::coroutine
|
Boost::coroutine
|
||||||
Boost::locale
|
Boost::locale
|
||||||
|
@ -281,7 +279,6 @@ if(ENABLE_SERVER)
|
||||||
Boost::program_options
|
Boost::program_options
|
||||||
Boost::regex
|
Boost::regex
|
||||||
Boost::system
|
Boost::system
|
||||||
Boost::thread
|
|
||||||
Boost::random
|
Boost::random
|
||||||
Boost::coroutine
|
Boost::coroutine
|
||||||
Boost::locale
|
Boost::locale
|
||||||
|
@ -323,7 +320,6 @@ if(ENABLE_CAMPAIGN_SERVER)
|
||||||
Boost::program_options
|
Boost::program_options
|
||||||
Boost::regex
|
Boost::regex
|
||||||
Boost::system
|
Boost::system
|
||||||
Boost::thread
|
|
||||||
Boost::random
|
Boost::random
|
||||||
Boost::coroutine
|
Boost::coroutine
|
||||||
Boost::locale
|
Boost::locale
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "map/map.hpp"
|
#include "map/map.hpp"
|
||||||
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <sstream>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
|
||||||
color_range_map recolor_range(const color_range& new_range, const std::vector<color_t>& old_rgb)
|
color_range_map recolor_range(const color_range& new_range, const std::vector<color_t>& old_rgb)
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <numeric>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#include <boost/bimap.hpp>
|
#include <boost/bimap.hpp>
|
||||||
#include <boost/bimap/set_of.hpp>
|
#include <boost/bimap/set_of.hpp>
|
||||||
#include <boost/bimap/multiset_of.hpp>
|
#include <boost/bimap/multiset_of.hpp>
|
||||||
#include <boost/multi_array.hpp>
|
|
||||||
|
|
||||||
#include "exceptions.hpp"
|
#include "exceptions.hpp"
|
||||||
#include "map/location.hpp"
|
#include "map/location.hpp"
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
#include "commandline_options.hpp"
|
#include "commandline_options.hpp"
|
||||||
|
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/assign.hpp>
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE( cmdline_opts )
|
BOOST_AUTO_TEST_SUITE( cmdline_opts )
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
#include "saved_game.hpp"
|
#include "saved_game.hpp"
|
||||||
#include "tests/utils/fake_display.hpp"
|
#include "tests/utils/fake_display.hpp"
|
||||||
|
|
||||||
#include <boost/assign.hpp>
|
|
||||||
|
|
||||||
/* Definitions */
|
/* Definitions */
|
||||||
|
|
||||||
class test_connect_engine : public ng::connect_engine {
|
class test_connect_engine : public ng::connect_engine {
|
||||||
|
|
|
@ -32,13 +32,10 @@
|
||||||
"features": [ "icu" ]
|
"features": [ "icu" ]
|
||||||
},
|
},
|
||||||
"boost-asio",
|
"boost-asio",
|
||||||
"boost-assign",
|
|
||||||
"boost-program-options",
|
"boost-program-options",
|
||||||
"boost-system",
|
"boost-system",
|
||||||
"boost-thread",
|
|
||||||
"boost-bimap",
|
"boost-bimap",
|
||||||
"boost-math",
|
"boost-math",
|
||||||
"boost-multi-array",
|
|
||||||
"boost-logic",
|
"boost-logic",
|
||||||
"boost-format",
|
"boost-format",
|
||||||
"boost-scope-exit",
|
"boost-scope-exit",
|
||||||
|
|
Loading…
Add table
Reference in a new issue