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

64-bit fixes #355

Merged
merged 1 commit into from
May 23, 2024
Merged

64-bit fixes #355

merged 1 commit into from
May 23, 2024

Conversation

GravisZro
Copy link
Contributor

@GravisZro GravisZro commented May 15, 2024

Description

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes (return types are now consistent with the data format)
    • Input changes
    • Network changes
    • Other changes

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.
  • understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

@Lgt2x
Copy link
Collaborator

Lgt2x commented May 15, 2024

Any overlap with #354 ?

@GravisZro GravisZro force-pushed the fix/64bit branch 3 times, most recently from 6ecaa01 to 3dfa765 Compare May 15, 2024 19:20
@GravisZro
Copy link
Contributor Author

Any overlap with #354 ?

Yes. I suppose I'll remove the overlap.

@pzychotic
Copy link
Contributor

What a timing with my stuff :)

Any overlap with #354 ?

Most stuff I touched in 6ecafd9 is done in a slightly different way.

@GravisZro
Copy link
Contributor Author

What a timing with my stuff :)

I swear it's like any time I make a contribution that someone just MUST get in and do the same thing. sigh

@JeodC JeodC added the build Modification to the build system label May 15, 2024
@GravisZro GravisZro force-pushed the fix/64bit branch 20 times, most recently from 3ffe640 to 888be05 Compare May 17, 2024 01:17
@GravisZro GravisZro force-pushed the fix/64bit branch 9 times, most recently from ecc156d to 35a1ad9 Compare May 19, 2024 16:41
@GravisZro GravisZro marked this pull request as ready for review May 19, 2024 16:55
@JeodC JeodC requested a review from jcoby May 20, 2024 19:40
lib/win/DirectX/d3dtypes.h Outdated Show resolved Hide resolved
third_party/stb/stb_image_write.h Outdated Show resolved Hide resolved
@GravisZro
Copy link
Contributor Author

@winterheart issues resolved.

Copy link
Collaborator

@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.

Great work, thanks! Diff looks good, I'll give it a go on Windows and let @winterheart approve additionally. Good idea to split it in multiple PR for easier reviewing

Switch all the (u)long types to (u)int32_t where appropriate.
@Lgt2x Lgt2x merged commit a1a8056 into DescentDevelopers:main May 23, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Modification to the build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants