preserve-emulation/dolphin
1
0 Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-10-10 21:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

windows: remove now-extraneous NOMINMAX and WIN32_LEAN_AND_MEAN #defines from dolphin code.

Browse Source 
Wrap dinput.h in a header defining DIRECTINPUT_VERSION instead of repeating it multiple places.
This commit is contained in:
Shawn Hoffman committed 2014-08-23 10:48:48 -07:00
1 parent 6a5188c9bc
commit 327d35377d
12 files changed
+24 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
+4 -1
View File
@@ -48,8 +48,11 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device)
void Init(std::vector<Core::Device*>& 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);