Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cmake options to disable optional dependencies #4487

Merged
merged 3 commits into from Dec 27, 2016

Conversation

linkmauve
Copy link
Member

This allows people to build without some of these dependencies even though they are present on the system. This is helpful especially when building a package for other people.

@ligfx
Copy link
Contributor

ligfx commented Dec 4, 2016

Should hires textures ever be disabled? That seems like one of the big selling points of Dolphin. Maybe an option to force building the local copy of SOIL would be better.

@linkmauve
Copy link
Member Author

I guess most people never once tried this feature, nor know anything about it, or don’t even have a computer powerful enough to use it.

But the point of this PR is to make optional dependencies actually optional at build time, so the person building Dolphin doesn’t need to manually remove them from their system in order not to use them.

(And my reason for wanting to disable SOIL is to make the nogui frontend build properly even with -DENABLE_EGL=TRUE, which doesn’t pull libGL.so in, which SOIL depends on.)

@degasus
Copy link
Member

degasus commented Dec 9, 2016

Hm, I dislike that the GUI still shows the custom texture option, and we still try to load them but fail. So the usability with disabled SOIL is terrible.

But as we should replace SOIL with libpng itself, we hopefully get rid of this at somepoint. so LGTM

@linkmauve
Copy link
Member Author

I just dropped the SOIL part from this PR, I will fix that in another PR, this one only does the audio backends, LLVM and Bluetooth now.

add_definitions(-DHAVE_ALSA=0)
message("ALSA NOT found, disabling ALSA sound backend")
endif(ALSA_FOUND)
else(ENABLE_ALSA)

This comment was marked as off-topic.

This comment was marked as off-topic.

They are already disabled when the libraries can’t be found, this only
helps people who want to build without them despite having them
installed, for example to provide a package to someone else.
This makes the disassembler only work for x86.
This removes bluetooth support.
@degasus degasus merged commit a9eaaea into dolphin-emu:master Dec 27, 2016
@linkmauve linkmauve deleted the optional-dependencies branch December 29, 2016 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants