[compat] fix libusb when disabled error (solaris, fbsd, etc) #2649

Open
Lizzie wants to merge 2 commits from fix-compat-libusb-1 into master
Member

This fixes an issue in builds where libusb is disabled, it also uses and prioritizes system dependencies over vendored ones (so ports is easier)

Signed-off-by: lizzie lizzie@eden-emu.dev

This fixes an issue in builds where libusb is disabled, it also uses and prioritizes system dependencies over vendored ones (so ports is easier) Signed-off-by: lizzie <lizzie@eden-emu.dev>
Lizzie added 1 commit 2025-10-02 03:03:37 +02:00
[compat] fix libusb when disabled error (solaris, fbsd, etc)
Some checks failed
eden-license / license-header (pull_request) Failing after 44m45s
bec05851d5
This fixes an issue in builds where libusb is disabled, it also uses and prioritizes system dependencies over vendored ones (so ports is easier)

Signed-off-by: lizzie <lizzie@eden-emu.dev>
requested reviews from crueter, CamilleLaVey, Maufeat, MrPurple666, MaranBr 2025-10-02 03:03:37 +02:00
crueter requested changes 2025-10-02 17:25:36 +02:00
CMakeLists.txt Outdated
@ -172,3 +174,3 @@
mark_as_advanced(FORCE ENABLE_OPENGL)
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
cmake_dependent_option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON "WIN32 OR ANDROID OR PLATFORM_LINUX OR APPLE" OFF)
Owner

why?

why?
Author
Member

Easier for FBSD ports when we eventually get there

Easier for FBSD ports when we eventually get there
Owner

It shouldn't be forced off, ever. You can change the default if you wish though

It shouldn't be forced off, ever. You can change the default if you wish though
crueter marked this conversation as resolved
Lizzie added 1 commit 2025-10-02 23:21:58 +02:00
enable by default always
Some checks failed
eden-license / license-header (pull_request) Failing after 21s
0cf6ee63b9
Signed-off-by: lizzie <lizzie@eden-emu.dev>
crueter requested changes 2025-10-04 08:34:30 +02:00
@ -157,2 +157,3 @@
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)
Owner

Cmake dependent option forces it off here if the fourth argument is true, so you should just do

if (PLATFORM_FREEBSD)
    set(CUBEB_DEFAULT OFF)
else()
    set(CUBEB_DEFAULT ON)
endif()

option(ENABLE_CUBEB "Enables the cubeb audio backend" ${ENABLE_CUBEB})

also, it gets vendored either way, so idk if this is even needed

Cmake dependent option *forces* it off here if the fourth argument is true, so you should just do ```cmake if (PLATFORM_FREEBSD) set(CUBEB_DEFAULT OFF) else() set(CUBEB_DEFAULT ON) endif() option(ENABLE_CUBEB "Enables the cubeb audio backend" ${ENABLE_CUBEB}) ``` also, it gets vendored either way, so idk if this is even needed
crueter added this to the 0.0.4 (real) milestone 2025-10-10 02:45:43 +02:00
Some checks failed
eden-license / license-header (pull_request) Failing after 21s
Required
Details
This pull request doesn't have enough approvals yet. 0 of 2 approvals granted.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin fix-compat-libusb-1:fix-compat-libusb-1
git checkout fix-compat-libusb-1
Sign in to join this conversation.
No description provided.