From c6374a899c07a102025b12a0d2827fc512338fcf Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Sat, 13 Nov 2021 15:40:20 +0100
Subject: [PATCH] win32: build fix when sdl2 is not enabled

---
 core/windows/winmain.cpp      | 8 ++++----
 core/windows/xinput_gamepad.h | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp
index 0539957c7..fb8a1e95a 100644
--- a/core/windows/winmain.cpp
+++ b/core/windows/winmain.cpp
@@ -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;
diff --git a/core/windows/xinput_gamepad.h b/core/windows/xinput_gamepad.h
index eed983d6e..b17c3e622 100644
--- a/core/windows/xinput_gamepad.h
+++ b/core/windows/xinput_gamepad.h
@@ -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;
 };