upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 15:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added VC14 support

Browse Source
This commit is contained in:
midzer 2015-08-04 03:35:45 +02:00
parent d2375c07b6
commit 7a32ff0e45
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game_config_manager.cpp
View File

@ -81,7 +81,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 mptest("MP_TEST", cmdline_opts_.mptest);
game_config::scoped_preproc_define editor("EDITOR", jump_to_editor_);
game_config::scoped_preproc_define title_screen("TITLE_SCREEN",

7
src/global.hpp
View File

@ -17,8 +17,13 @@
#ifdef _MSC_VER
// Enable C99 support for VC14
#if _MSC_VER>=1900
#define STDC99
#else
#undef snprintf
#define snprintf _snprintf
#endif
// Disable warning about source encoding not in current code page.
#pragma warning(disable: 4819)
@ -26,7 +31,7 @@
// Disable warning about deprecated functions.
#pragma warning(disable: 4996)
//disable some MSVC warnings which are useless according to mordante
// Disable some MSVC warnings which are useless according to mordante
#pragma warning(disable: 4244)
#pragma warning(disable: 4345)
#pragma warning(disable: 4250)