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 build with minizip-ng>=4.0.8 #13273

Merged
merged 1 commit into from
Jan 19, 2025

Conversation

JoshuaVandaele
Copy link
Contributor

Minizip-ng 4.0.8 introduced a change where the compatibility layer was split into multiple source files. This caused dolphin to fail to build. This PR aims to remedy that.

I tested compilation and launching a game that uses a resource pack, which both worked fine for me.

@BhaaLseN
Copy link
Member

Can you update Externals/minizip-ng/minizip-ng.vcxproj too please, to make Windows builds happy? Basically the same changes you did to Externals/minizip-ng/CMakeLists.txt, except as XML. Just copy the elements and replace the files, preferably in the right group (source vs. header) and alphabetically sorted like the rest.

@JoshuaVandaele
Copy link
Contributor Author

JoshuaVandaele commented Jan 11, 2025

I'm not sure why the Windows build is still failing, I'm in the process of creating a virtual machine so I can debug that locally.

@dpeukert
Copy link
Contributor

dpeukert commented Jan 12, 2025

AFAICT, when using the system minizip-ng library, upstream does not provide the header files in the compat subdirectory, but directly in the root (not very familiar with C/C++, so my nomenclature might be a bit off), at least on my machine. Removing the compat/ prefix from the includes fixed the build for me when using the system library.

@JoshuaVandaele JoshuaVandaele force-pushed the master branch 2 times, most recently from 8ffed89 to 7c36a4e Compare January 12, 2025 12:19
@JoshuaVandaele
Copy link
Contributor Author

@dpeukert Could you please test if compiling with your system minizip-ng properly works now? I have tested locally but I'm not sure if I've done so correctly.

@dpeukert
Copy link
Contributor

@JoshuaVandaele Can confirm that I'm now able to build this PR.

Copy link
Member

@Tilka Tilka left a comment

Choose a reason for hiding this comment

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

This fixes compilation on Arch Linux.

CMakeLists.txt Outdated Show resolved Hide resolved
@dolphin-ci
Copy link

dolphin-ci bot commented Jan 19, 2025

FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:

  • sw3-dt on ogl-lin-mesa: diff

automated-fifoci-reporter

@AdmiralCurtiss
Copy link
Contributor

Knowing minizip this will inevitably break some other system, but I guess we'll take it anyway for the version update.

@AdmiralCurtiss AdmiralCurtiss merged commit 90eba2b into dolphin-emu:master Jan 19, 2025
13 checks passed
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.

6 participants