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

Fix Windows x86 build #640

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Conversation

pzychotic
Copy link
Contributor

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

This fixes compilation of Windows x86 builds when creating template instantiations of FnPtr with functions using __stdcall.
The x64 case works because the decltype of void __stdcall Fun(...) is the same as void Fun(...) so the missing GLFUNCCALL in the declaration does not matter.
With this change I was able to run a local x86 build of the game.

Related Issues

Related to #631

Screenshots (if applicable)

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

…tion

This fixes compilation of Windows x86 builds when creating template instantiations of FnPtr with functions using __stdcall.
Copy link
Member

@Lgt2x Lgt2x left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch :)

@Lgt2x Lgt2x merged commit d51ce96 into DescentDevelopers:main Oct 29, 2024
10 checks passed
@pzychotic pzychotic deleted the fix-win-x86-build branch October 29, 2024 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants