diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-08-23 11:02:48 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-08-23 11:02:48 -0700 |
| commit | f964a282e10a321697be4b3442ee846e499652c0 (patch) | |
| tree | 5f9e8490eb13659fa17dd107c74c7cb1cc6d8fe0 /Source/Core/InputCommon/ControllerInterface/DInput/DInput.h | |
| parent | 6a5188c9bc567a070797a715bbffa47479a62b23 (diff) | |
| parent | 327d35377dd0edfcb3f0a5d7b2853f23102eb950 (diff) | |
Merge pull request #857 from shuffle2/msvc-improvements
windows: remove now-extraneous NOMINMAX and WIN32_LEAN_AND_MEAN #defines
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInput.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index b4f1b27199..84f9832c53 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -6,14 +6,11 @@ #define DINPUT_SOURCE_NAME "DInput" -#define DIRECTINPUT_VERSION 0x0800 -#define WIN32_LEAN_AND_MEAN -#define NOMINMAX -#include <dinput.h> #include <list> #include <windows.h> #include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/DInput/DInput8.h" namespace ciface { |