Codechange: Comprehensive refactor of make rules and output structure#21
Open
zephyris wants to merge 1 commit into
Open
Codechange: Comprehensive refactor of make rules and output structure#21zephyris wants to merge 1 commit into
zephyris wants to merge 1 commit into
Conversation
zephyris
force-pushed
the
make-restructure
branch
from
August 26, 2025 10:50
f4ff7b3 to
4d2e582
Compare
Contributor
Author
|
Hmm, not sure why it thinks there are conflicts - changes made, I'll get back to fixing the conflicts later. |
Keeps TTF generation under `make all`, but now puts output TTFs in `ttf/`. Moves preview image generation to a separate rule, `make preview`, and puts outputs in `previews/`. Fix readme links as needed. Keep preview images in repo, but update readme to indicate that they can be infrequently updated, eg. on release. Remove TTFs from repo, instead point downloads to releases. Should prevent branches/PRs having version clashes with binary TTF and PNG files.
zephyris
force-pushed
the
make-restructure
branch
from
August 26, 2025 14:17
4d2e582 to
5b5ad22
Compare
This file contains hidden or 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
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.
The repo set up so that binary outputs, TTF files and PNG preview images, were updated with each commit. This leads to rebase/merge messiness.
This is a refactor of the make rules and output structure to try to tidy this:
openttd-sans/etc.make allrule, but now puts output TTFs inttf/.make preview, and puts output PNGs inpreviews/.I'm not certain that this is the right solution, but seems sensible? Comments & criticism very welcome.
This change would break the OpenGFX2 build, as it clones this repo and expects to find the TTF files as part of the repo.