ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: build fix when sdl2 is not enabled

This commit is contained in:
scribam 2021-11-13 15:40:20 +01:00 committed by flyinghead
parent 8f80bcb159
commit c6374a899c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/windows/winmain.cpp
View File

@ -147,7 +147,7 @@ static bool gameRunning;
static void captureMouse(bool);
static void emuEventCallback(Event event)
static void emuEventCallback(Event event, void *)
{
static bool captureOn;
switch (event)
@ -365,11 +365,11 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT message, WPARAM wParam, LPARAM
mouse->setAbsPos(xPos, yPos, settings.display.width, settings.display.height);
if (wParam & MK_LBUTTON)
mouse->setButton(Button::LEFT_BUTTON, true);
mouse->setButton(Mouse::LEFT_BUTTON, true);
if (wParam & MK_MBUTTON)
mouse->setButton(Button::MIDDLE_BUTTON, true);
mouse->setButton(Mouse::MIDDLE_BUTTON, true);
if (wParam & MK_RBUTTON)
mouse->setButton(Button::RIGHT_BUTTON, true);
mouse->setButton(Mouse::RIGHT_BUTTON, true);
}
if (message != WM_MOUSEMOVE)
return 0;

5
core/windows/xinput_gamepad.h
View File

@ -1,4 +1,5 @@
#include "input/gamepad_device.h"
#include "input/mouse.h"
#include "rend/gui.h"
#include <windows.h>
@ -167,7 +168,7 @@ public:
}
protected:
void load_axis_min_max(u32 axis) override
void load_axis_min_max(u32 axis)
{
if (axis == 0 || axis == 1)
{
@ -202,6 +203,8 @@ private:
s16 last_right_thumb_y = 0;
double vib_stop_time;
float vib_inclination;
std::map<u32, int> axis_min_values;
std::map<u32, unsigned int> axis_ranges;
static std::vector<std::shared_ptr<XInputGamepadDevice>> xinput_gamepads;
};