🐛 PROS 4: Fix llemu.h and llemu.hpp includes #560
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
This was referenced Mar 24, 2023
WillXuCodes
requested changes
Mar 24, 2023
common.mk
Outdated
| WARNFLAGS+=-Wno-psabi | ||
|
|
||
| SPACE := $() $() | ||
| COMMA := , | ||
|
|
||
| C_STANDARD?=gnu11 | ||
| CXX_STANDARD?=gnu++20 | ||
| CXX_STANDARD?=gnu++2a |
WillXuCodes
requested changes
Mar 26, 2023
Closed
Merged
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.
Overview:
This PR is part of the fix for lcd::print() issue on the liblvgl repo: purduesigbots/liblvgl#25
This moves the weak symbols for liblvgl into new
llemu.hppandllemu.hfiles. Then, the actual llemu headers in the liblvgl repo are conditionally included if they are found by common.mk. This ensures that when liblvgl is present, the llemu headers are included inapi.has they were in PROS 3. When the llemu headers are not included in api.h, the user program only sees the weak symbols (despite the fact strong symbols are present), and will not link to the strong ones.There are two sperate PRS for the liblvgl repo that implement the necessary changes for liblvgl: one for LVGL 5.3.x and another for LVGL 8.3.x:
Tests: