Fix legacy font names - #67
Open
mishan wants to merge 2 commits into
Open
Conversation
multiversal moved the legacy font-name aliases (geneva, symbol, helvetica and friends) behind #if OLDROUTINENAMES in March 2024. Executor never defines that macro, so as soon as the submodule is advanced past that commit the aliases vanish from the generated FontMgr.h and four files stop compiling. Switch the nine call sites to the kFontID* enumerators the aliases expand to. These are the same values, so there is no behaviour change, and the sources no longer depend on a compatibility shim that is off by default in both generators -- CIncludes defines OLDROUTINENAMES to 0 unless asked otherwise. Comments that mention the fonts by their familiar names are left as they are; they read better that way.
Executor has been pinned to a multiversal from before the font-name change, which is why the previous commit was not needed until now. With it applied, romlib, the SDL2 front end and the test suite all build against current multiversal.
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
1 participant
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.
multiversal moved the legacy font-name aliases (geneva, symbol,
helvetica and friends) behind #if OLDROUTINENAMES in March 2024.
Executor never defines that macro, so as soon as the submodule is
advanced past that commit the aliases vanish from the generated
FontMgr.h and four files stop compiling.
Switch the nine call sites to the kFontID* enumerators
This also advances multiversal to the latest commit, though the submodule
update could be dropped if preferred.