VERY experimental Nintendo Switch 2 emulator
C++
[compat] fix libusb when disabled error (solaris, fbsd, etc) (#2649)
lizzie05c721bb41c4
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 8759d1640a..c0c117fcf1 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -183,7 +183,8 @@ option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")-option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)+# FreeBSD doesn't have a cubeb port yet, vendoring it isn't required (it's optional anyways)+cmake_dependent_option(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT PLATFORM_FREEBSD" OFF)set(EXT_DEFAULT OFF)if (MSVC OR ANDROID)@@ -198,7 +199,8 @@ cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PL# siritoption(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)+# Re-allow on FreeBSD once its on mainline ports+cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR APPLE" OFF)cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)mark_as_advanced(FORCE ENABLE_OPENGL)diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txtindex d455323e05..f49db2ea3c 100644--- a/src/input_common/CMakeLists.txt+++ b/src/input_common/CMakeLists.txt@@ -1,3 +1,6 @@+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project# SPDX-License-Identifier: GPL-2.0-or-later@@ -83,7 +86,7 @@ if (ENABLE_LIBUSB)drivers/gc_adapter.h)target_link_libraries(input_common PRIVATE libusb::usb)- target_compile_definitions(input_common PRIVATE HAVE_LIBUSB)+ target_compile_definitions(input_common PRIVATE ENABLE_LIBUSB)endif()create_target_directory_groups(input_common)diff --git a/src/input_common/main.cpp b/src/input_common/main.cppindex 62a7ae40f8..b04a70590a 100644--- a/src/input_common/main.cpp+++ b/src/input_common/main.cpp@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+// SPDX-FileCopyrightText: 2017 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later@@ -19,7 +22,7 @@#include "input_common/input_poller.h"#include "input_common/main.h"-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSB#include "input_common/drivers/gc_adapter.h"#endif#ifdef HAVE_SDL2@@ -76,7 +79,7 @@ struct InputSubsystem::Impl {RegisterEngine("keyboard", keyboard);RegisterEngine("mouse", mouse);RegisterEngine("touch", touch_screen);-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBRegisterEngine("gcpad", gcadapter);#endifRegisterEngine("cemuhookudp", udp_client);@@ -110,7 +113,7 @@ struct InputSubsystem::Impl {UnregisterEngine(keyboard);UnregisterEngine(mouse);UnregisterEngine(touch_screen);-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBUnregisterEngine(gcadapter);#endifUnregisterEngine(udp_client);@@ -145,7 +148,7 @@ struct InputSubsystem::Impl {auto android_devices = android->GetInputDevices();devices.insert(devices.end(), android_devices.begin(), android_devices.end());#endif-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBauto gcadapter_devices = gcadapter->GetInputDevices();devices.insert(devices.end(), gcadapter_devices.begin(), gcadapter_devices.end());#endif@@ -178,7 +181,7 @@ struct InputSubsystem::Impl {return android;}#endif-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBif (engine == gcadapter->GetEngineName()) {return gcadapter;}@@ -263,7 +266,7 @@ struct InputSubsystem::Impl {return true;}#endif-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBif (engine == gcadapter->GetEngineName()) {return true;}@@ -294,7 +297,7 @@ struct InputSubsystem::Impl {#ifdef ANDROIDandroid->BeginConfiguration();#endif-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBgcadapter->BeginConfiguration();#endifudp_client->BeginConfiguration();@@ -310,7 +313,7 @@ struct InputSubsystem::Impl {#ifdef ANDROIDandroid->EndConfiguration();#endif-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBgcadapter->EndConfiguration();#endifudp_client->EndConfiguration();@@ -343,7 +346,7 @@ struct InputSubsystem::Impl {std::shared_ptr<VirtualAmiibo> virtual_amiibo;std::shared_ptr<VirtualGamepad> virtual_gamepad;-#ifdef HAVE_LIBUSB+#ifdef ENABLE_LIBUSBstd::shared_ptr<GCAdapter> gcadapter;#endif