Use hidapi for Wiimotes on Windows (#1033)

cemu-project · Dec 6, 2023 · 1849083 · 1849083
1 parent 09409a5
commit 1849083
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 175 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,10 +89,9 @@ if (WIN32)
 	option(ENABLE_XINPUT "Enables the usage of XInput" ON)
 	option(ENABLE_DIRECTINPUT "Enables the usage of DirectInput" ON)
 	add_compile_definitions(HAS_DIRECTINPUT)
-	set(ENABLE_WIIMOTE ON)
-elseif (UNIX)
-	option(ENABLE_HIDAPI "Build with HIDAPI" ON)
 endif()
+
+option(ENABLE_HIDAPI "Build with HIDAPI" ON)
 option(ENABLE_SDL "Enables the SDLController backend" ON)
 
 # audio backends

diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
@@ -70,18 +70,9 @@ if (ENABLE_WIIMOTE)
 			api/Wiimote/NativeWiimoteController.h
 			api/Wiimote/NativeWiimoteController.cpp
 			api/Wiimote/WiimoteDevice.h
-	)
-	if (ENABLE_HIDAPI)
-		target_sources(CemuInput PRIVATE
 			api/Wiimote/hidapi/HidapiWiimote.cpp
 			api/Wiimote/hidapi/HidapiWiimote.h
-		)
-	elseif (WIN32)
-		target_sources(CemuInput PRIVATE
-			api/Wiimote/windows/WinWiimoteDevice.cpp
-			api/Wiimote/windows/WinWiimoteDevice.h
-		)
-	endif()
+	)
 endif ()
 
 

diff --git a/src/input/api/Wiimote/WiimoteControllerProvider.cpp b/src/input/api/Wiimote/WiimoteControllerProvider.cpp
@@ -2,11 +2,7 @@
 #include "input/api/Wiimote/NativeWiimoteController.h"
 #include "input/api/Wiimote/WiimoteMessages.h"
 
-#ifdef HAS_HIDAPI
 #include "input/api/Wiimote/hidapi/HidapiWiimote.h"
-#elif BOOST_OS_WINDOWS
-#include "input/api/Wiimote/windows/WinWiimoteDevice.h"
-#endif
 
 #include <numbers>
 #include <queue>

diff --git a/src/input/api/Wiimote/windows/WinWiimoteDevice.cpp b/src/input/api/Wiimote/windows/WinWiimoteDevice.cpp
diff --git a/src/input/api/Wiimote/windows/WinWiimoteDevice.h b/src/input/api/Wiimote/windows/WinWiimoteDevice.h
diff --git a/vcpkg.json b/vcpkg.json
@@ -26,10 +26,7 @@
     "boost-static-string",
     "boost-random",
     "fmt",
-    {
-      "name": "hidapi",
-      "platform": "!windows"
-    },
+    "hidapi",
     "libpng",
     "glm",
     {