From fe9ee1a80d79816715e0839da5e3aa492cf05c41 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 14 Mar 2026 01:33:52 +0000 Subject: [PATCH] port fixes --- externals/renderdoc/renderdoc_app.h | 2 +- src/citron/CMakeLists.txt | 2 +- src/citron/qt_common.cpp | 4 +++- src/input_common/main.cpp | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/externals/renderdoc/renderdoc_app.h b/externals/renderdoc/renderdoc_app.h index 0f4a1f98b3..83d753db85 100644 --- a/externals/renderdoc/renderdoc_app.h +++ b/externals/renderdoc/renderdoc_app.h @@ -36,7 +36,7 @@ #include #endif -#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) +#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__FreeBSD__) #define RENDERDOC_CC __cdecl #elif defined(__linux__) #define RENDERDOC_CC diff --git a/src/citron/CMakeLists.txt b/src/citron/CMakeLists.txt index 46c82f28e9..0b862251e2 100644 --- a/src/citron/CMakeLists.txt +++ b/src/citron/CMakeLists.txt @@ -474,7 +474,7 @@ if (TARGET LibArchive::LibArchive) endif() target_link_libraries(citron PRIVATE Vulkan::Headers) -if (NOT WIN32) +if (NOT WIN32 AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") target_link_libraries(citron PRIVATE Qt6::GuiPrivate) endif() if (UNIX AND NOT APPLE) diff --git a/src/citron/qt_common.cpp b/src/citron/qt_common.cpp index cb604c4dd7..a2ee058dc3 100644 --- a/src/citron/qt_common.cpp +++ b/src/citron/qt_common.cpp @@ -8,7 +8,9 @@ #include "core/frontend/emu_window.h" #include "citron/qt_common.h" -#if !defined(WIN32) && !defined(__APPLE__) +#if defined(__FreeBSD__) +#include "/usr/local/include/qt6/QtGui/6.10.1/QtGui/qpa/qplatformnativeinterface.h" +#elif !defined(WIN32) && !defined(__APPLE__) #include #elif defined(__APPLE__) #include diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 62a7ae40f8..62254fede5 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -19,6 +19,9 @@ #include "input_common/input_poller.h" #include "input_common/main.h" +#ifdef __FreeBSD__ +#undef HAVE_LIBUSB +#endif #ifdef HAVE_LIBUSB #include "input_common/drivers/gc_adapter.h" #endif @@ -31,6 +34,10 @@ #include "input_common/drivers/android.h" #endif +#ifdef __FreeBSD__ +#undef HAVE_LIBUSB +#endif + namespace InputCommon { /// Dummy engine to get periodic updates