From 626e58700eba99a4038d2c408b079c2d254b713b Mon Sep 17 00:00:00 2001 From: Tracy Ward Date: Fri, 4 Oct 2019 09:46:51 -0400 Subject: [PATCH] Fix build errors with IH_DirectInput using the Win SDK * dxguid.lib no longer exists. * older SDKs (like the v140_xp toolset) don't provide XUSER_MAX_COUNT. --- src/arch/InputHandler/InputHandler_DirectInput.cpp | 6 ++++++ src/arch/InputHandler/InputHandler_DirectInputHelper.cpp | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/arch/InputHandler/InputHandler_DirectInput.cpp b/src/arch/InputHandler/InputHandler_DirectInput.cpp index 86872fda52..d04196bf05 100644 --- a/src/arch/InputHandler/InputHandler_DirectInput.cpp +++ b/src/arch/InputHandler/InputHandler_DirectInput.cpp @@ -20,6 +20,12 @@ #include #include +// this may not be defined if we are using an older Windows SDK. (for instance, toolsetversion v140_xp does not define it) +// the number was taken from the documentation +#ifndef XUSER_MAX_COUNT +#define XUSER_MAX_COUNT 4 +#endif + REGISTER_INPUT_HANDLER_CLASS2( DirectInput, DInput ); static vector Devices; diff --git a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp index c582dc7066..04e2b857b9 100644 --- a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp +++ b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp @@ -8,9 +8,6 @@ #if defined(_MSC_VER) #pragma comment(lib, "dinput8.lib") -#if defined(_WINDOWS) -#pragma comment(lib, "dxguid.lib") -#endif #endif LPDIRECTINPUT8 g_dinput = nullptr;