Fix some build errors with disable_3d=yes
#86874
Merged
+18
−18
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
AThousandShips
added
bug
topic:buildsystem
cherrypick:4.2
AThousandShips
force-pushed
the
no_3d_fix
branch
from
37c63f0 to
b7ccc65
Compare
AThousandShips
commented
Jan 6, 2024
There was a problem hiding this comment.
This parts errors regardless, a switch with only a default
AThousandShips
force-pushed
the
no_3d_fix
branch
from
b7ccc65 to
6abd7bb
Compare
AThousandShips
force-pushed
the
no_3d_fix
branch
from
6abd7bb to
a87a273
Compare
* Some tests were incorrectly included * SCU builds with animation * Animation `switch`
AThousandShips
force-pushed
the
no_3d_fix
branch
from
a87a273 to
c6a1ae7
Compare
akien-mga
approved these changes
Jan 8, 2024
akien-mga
changed the title
disable_3d=Yesdisable_3d=yes
|
Thanks! |
|
Thank you! |
|
Cherry-picked for 4.2.2. |
YuriSizov
removed
the
cherrypick:4.2
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.
switchI'm unsure if this is the best way with the scu, but it solves the issue, could also wrap the code in
#ifndefbut picked this way for right now, can switch if desiredI'm not sure why the linking fails with the SCU builds if the file is along with the others, so worth investigating separately
Edit: Swapped to the plain
#ifndefversion, felt more guaranteedThe issues with the SCU is link errors, which might be MSVC specific, haven't confirmed yetNot MSVC specific, happens on mingw as well