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. --- .../InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h') diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 558917e9cc..8f7ac67452 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -4,13 +4,10 @@ #pragma once -#define DIRECTINPUT_VERSION 0x0800 -#define WIN32_LEAN_AND_MEAN -#define NOMINMAX -#include #include #include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/DInput/DInput8.h" namespace ciface { -- cgit v1.2.3