chore(warn): Fix MSVC warning C4005.

Bumps GameSpySDK commit as part of this fix.

Author: OmniBlade

Code/BandTest/BandTest.cpp

@@ -39,7 +39,6 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#define WIN32_LEAN_AND_MEAN
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>

Code/CMakeLists.txt

@@ -8,6 +8,7 @@ target_compile_definitions(wwcommon INTERFACE
     NOMINMAX
     WIN32_LEAN_AND_MEAN
     _WIN32_WINNT=0x501
+    DIRECTINPUT_VERSION=0x800
     _CRT_NONSTDC_NO_WARNINGS
     _CRT_SECURE_NO_WARNINGS
     $<$<CONFIG:Debug>:WWDEBUG>

Code/Combat/directinput.cpp

@@ -39,8 +39,6 @@
 #include "debug.h"
 #include "timemgr.h"
 
-
-#define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 
 /*

Code/Combat/input.cpp

@@ -50,8 +50,6 @@
 #include "combat.h"
 #include "ccamera.h"
 
-
-#define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 
 #include <stdio.h>

Code/Commando/dlgcontrolslisttab.cpp

@@ -42,8 +42,6 @@
 #include "string_ids.h"
 #include "translatedb.h"
 
-
-#define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 #include "directinput.h"
 

Code/Launcher/winblows.cpp

@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 #include <stdlib.h>

Code/Launcher/winblows.h

@@ -19,7 +19,6 @@
 #ifndef WINBLOWS_HEADER
 #define WINBLOWS_HEADER
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 #include <stdlib.h>

Code/Tools/MakeMix/StdAfx.h

@@ -28,8 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 #include <stdio.h>
 
 // TODO: reference additional headers your program requires here

Code/Tools/SkeletonHack/StdAfx.h

@@ -28,8 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>

Code/Tools/pluglib/win.h

@@ -54,11 +54,6 @@
 #pragma warning(push, 3)
 #endif
 
-// this define should also be in the DSP just in case someone includes windows stuff directly
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
 #include	<windows.h>
 //#include <mmsystem.h>
 //#include	<windowsx.h>