Fix up macOS and Windows builds #1352
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…txt is now universal with all opts
…hardcoded import as it was fixed upstream
This was referenced Dec 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #995
Fixes #1161
Fixes #1175
Fixes #1188
Fixes #1349
Gets Windows building, albeit there's still some minor unresolved issues tracked in #1315.
Fix macOS CI as extra branch we were using is now deleted and fix in git master instead - switch to develop.
MSVC change was applying for MINGW too, now ifdef'd.
Phazor.c converted to tab indentation, indentation was fixed, and ifdef blocks are now indented.
Always install Rust even though it may not be always needed, the 80MB dep won't hurt in exchange for preventing fails and it also simplifies docs.
Stop using requirements_optional.txt for run.sh, requirements.txt already has optionals.
Fix requirements_optional.txt as it had opencc without OS limit.
Move the extra req.txt files to extra/ as we only need requirements.txt which has cross-platform deps + opts too, and requirements_devel.txt for stubs.
Put Pillow back, it is necessary.
Fix not including libraries in run.sh for mingw - this made Pillow build from source fail.
phazor functions are now exported for Python, this seems to have been necessary for both MSVC and MINGW64
MINGW64 is mildly kicking us here with msys2/MINGW-packages#22856 but one can just copy the w binary over and rename it to the needed one.