Fix windows x86 discord integration #6893
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the Discord integration on MSVC on x86.
In devilutionX we are applying some patches to the Discord sdk to fix various issues:
The last point (fixing calling convention) breaks MSVC x86 builds.
The applied fix adds
DISCORD_CALLBACK
to lambdas.DISCORD_CALLBACK
is defined asSo it's only set on Windows x86 builds. That's why x64 builds work on MSVC.
The devilutionX fixes are not needed on Windows and MSVC. So this PR disables them altogether when using MSVC.
I'm open to better fixes. 😉