From 327d35377dd0edfcb3f0a5d7b2853f23102eb950 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 22 Aug 2014 17:17:49 -0700 Subject: windows: remove now-extraneous NOMINMAX and WIN32_LEAN_AND_MEAN #defines from dolphin code. Wrap dinput.h in a header defining DIRECTINPUT_VERSION instead of repeating it multiple places. --- Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 48b5884312..aac795d880 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -48,8 +48,11 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) void Init(std::vector& devices, HWND hwnd) { IDirectInput8* idi8; - if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, nullptr))) + if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, + IID_IDirectInput8, (LPVOID*)&idi8, nullptr))) + { return; + } InitKeyboardMouse(idi8, devices, hwnd); InitJoystick(idi8, devices, hwnd); -- cgit v1.2.3