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 the build when XDelta is enabled on certain platforms #15968

Merged
merged 9 commits into from
Dec 5, 2023

Conversation

JesseTG
Copy link
Contributor

@JesseTG JesseTG commented Nov 30, 2023

Description

This PR fixes the build on some platforms when XDelta3 support is enabled.

Related Issues

Maybe #15963, I don't know yet. I'll follow up and ask the reporter to test this PR.

Related Pull Requests

This comment says that Android won't build with XDelta3 support enabled. I don't know if this PR fixes that issue; I'd like to see if #15962 does, first.

Reviewers

@LibretroAdmin

@JesseTG
Copy link
Contributor Author

JesseTG commented Dec 1, 2023

I'd like to be sure that this fixes the issue on Android before merging this.

@JesseTG JesseTG marked this pull request as ready for review December 4, 2023 14:50
@LibretroAdmin
Copy link
Contributor

LGTM.

@LibretroAdmin LibretroAdmin merged commit 17c9227 into libretro:master Dec 5, 2023
22 checks passed
Sunderland93 pushed a commit to Sunderland93/RetroArch that referenced this pull request Dec 26, 2024
…5968)

* Rename the `MIN_MATCH` defined by xdelta3 to `XD3_MIN_MATCH`

- zlib defines its own macro by that name, but with a different value

* Don't redefine `SIZEOF_ARRAY` in xdelta3 if it already exists

* Don't define ssize_t in xdelta3, rely on libretro's definition instead

* Enable xdelta3 support in MSVC 2015-2019

* Fix some invalid MSBuild condition syntax

* Always build xdelta with XD3_USE_LARGESIZET as 1

* Fix an `#if` in task_patch.c

* Enable `HAVE_XDELTA` in the UWP build

* First crack at fixing Xdelta support for Android
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