0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow compilation in MSVC14/2015.

Browse source
This commit is contained in:
Wedge009 2015-10-27 21:27:13 +11:00
parent 8365d0e2ee
commit ba228fff54
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_config_manager.cpp
View file

@ -68,7 +68,7 @@ bool game_config_manager::init_game_config(FORCE_RELOAD_CONFIG force_reload)
// Add preproc defines according to the command line arguments.
game_config::scoped_preproc_define multiplayer("MULTIPLAYER",
cmdline_opts_.multiplayer);
game_config::scoped_preproc_define test("TEST", cmdline_opts_.test);
game_config::scoped_preproc_define test("TEST", bool(cmdline_opts_.test));
game_config::scoped_preproc_define editor("EDITOR", jump_to_editor_);
game_config::scoped_preproc_define title_screen("TITLE_SCREEN",
!cmdline_opts_.multiplayer && !cmdline_opts_.test && !jump_to_editor_);

2
src/global.hpp
View file

@ -17,8 +17,10 @@
#ifdef _MSC_VER
#if _MSC_VER < 1900 // snprintf() is supported from MSVC 14 (2015) onwards
#undef snprintf
#define snprintf _snprintf
#endif
// Disable warning about source encoding not in current code page.
#pragma warning(disable: 4819)