From 30faef0ce8adb2d30a1935a4aa5fcbe767a13e84 Mon Sep 17 00:00:00 2001 From: Roman C Date: Mon, 25 Sep 2006 20:14:55 +0000 Subject: [PATCH] Temporary MSVC fix to r749 git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@761 4a71c877-e1ca-e34f-864e-861f7616d084 --- ChangeLog | 2 +- lib/framework/platform.h | 2 +- lib/framework/types.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33492fbe7..d6c510de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2006-09-07: Version 2.0.5 RC1 * General: - * New: Added beacons for skirmish and multiplayer, can be placed on map and radar, default key combination: Alt+H + * New: Added beacons for skirmish and multiplayer, can be placed on map and radar, only sent to the players to which you have an opened communication channel. Default key combination: Alt+H * New: Allied players send vision to each other automatically (only once) * New: Non-Mac versions can now load Mac-created savegames and the other way round * New: Ctrl+MouseWheel makes game speed up or slow down diff --git a/lib/framework/platform.h b/lib/framework/platform.h index 1e4ee01dc..81c06b2df 100644 --- a/lib/framework/platform.h +++ b/lib/framework/platform.h @@ -15,7 +15,7 @@ # endif /* WZ_CC_GNU */ # if defined(WZ_CC_MSVC) -# if defined()_DEBUG) +# if defined(_DEBUG) # define DEBUG # define _CRTDBG_MAP_ALLOC # include diff --git a/lib/framework/types.h b/lib/framework/types.h index 3c57112b0..a239c524e 100644 --- a/lib/framework/types.h +++ b/lib/framework/types.h @@ -12,6 +12,11 @@ #error Framework header files MUST be included from Frame.h ONLY. #endif +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +#endif // WIN32 + #include #ifdef _MSC_VER