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

curl: Update to 8.11.1 and use CMake to configure #13228

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

OatmealDome
Copy link
Member

@OatmealDome OatmealDome commented Dec 21, 2024

We currently use a single pre-configured header for libcurl on every platform that we use Externals curl for (minus the Windows vcxproj). Needless to say, this is a bad idea.

With this PR, we now configure curl for the target platform when using CMake.

I did have to add a hack to allow libcurl to link with our Externals mbedtls when it's being used. Not sure if there's a better way to accomplish this. I also tested this PR with Windows + CMake and everything works fine there.

Fixes https://bugs.dolphin-emu.org/issues/11772.

@OatmealDome OatmealDome marked this pull request as ready for review December 22, 2024 20:33
@OatmealDome OatmealDome requested a review from JosJuice December 23, 2024 00:39
@JosJuice
Copy link
Member

Can't say I'm the best person for reviewing CMake subtleties, but this looks reasonable overall, including from an Android perspective.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants