Tidy up font code #330
Merged
Tidy up font code #330
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
RhoSigma-QB64
approved these changes
Apr 4, 2023
mkilgore
approved these changes
Apr 6, 2023
| @@ -265,12 +265,12 @@ else | |||
| endif | |||
|
|
|||
| ifneq ($(filter y,$(DEP_FONT)),) | |||
| EXE_LIBS += $(QB_FONT_LIB) | |||
| CXXFLAGS += -DDEPENDENCY_LOADFONT | |||
| EXE_LIBS += $(FREETYPE_OBJS) $(FONT_OBJS) | |||
| QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME)) | |||
There was a problem hiding this comment.
Since the define is gone we can get rid of the QBLIB_NAME addition as well :) Very good stuff, it puts us one step closer to not having any more conditional compilation for libqb.cpp.
| #include "freetypeamalgam.h" | ||
| #include "rounding.h" | ||
|
|
||
| extern uint16_t codepage437_to_unicode16[]; |
There was a problem hiding this comment.
I think this extern should go in font.h. We also might consider moving the actual declaration into this file.
There was a problem hiding this comment.
That's a good idea.👍 I'll make this change in the next PR.
| FONT_STUB_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/video/font/%.o,$(FONT_STUB_SRCS)) | ||
|
|
||
| $(PATH_INTERNAL_C)/parts/video/font/%.o: $(PATH_INTERNAL_C)/parts/video/font/%.c | ||
| $(CC) -O2 $(CFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@ |
There was a problem hiding this comment.
For these lines you can get rid of the -DDEPENDENCY_CONSOLE_ONLY because none of these files depend on libqb.h (which was causing the problems).
a740g
added a commit
to a740g/QB64pe
that referenced
this pull request
Apr 8, 2023
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.
This PR is an effort (the first of many) to reach the end goal in #188.
The following changes were made:
internal/c/parts/video/font/and remove unnecessary filessrc.cfromlibqb.cppand instead move font code tofont.cppthat is compiled using a makefileIn subsequent font PRs, I'll try to move more font functions to
font.cppuntil we have something that is more-or-less self-contained.The ultimate step would be to swap out
FreeTypeAmalgamwithstb_truetype.