SCons: Fix Ninja compilation with MSVC #90208
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 breaks GCC/Clang: The angle brackets |
Repiteo
force-pushed
the
scons/ninja-msvc
branch
from
40d4b85 to
7918d50
Compare
akien-mga
reviewed
Apr 4, 2024
Comment on lines
+24
to
+26
| config_path = "thirdparty/mbedtls/include/godot_core_mbedtls_config.h" | ||
| config_path = f"<{config_path}>" if env_crypto["ninja"] and env_crypto.msvc else f'\\"{config_path}\\"' | ||
| env_crypto.Append(CPPDEFINES=[("MBEDTLS_CONFIG_FILE", config_path)]) |
There was a problem hiding this comment.
That's starting to be a bit convoluted...
I guess it's fine for now, but it would be worth figuring out why it's not being escaped properly by Ninja+MSVC, and how upstream mbedtls even expect this define to be passed in a way that won't break on some platforms.
There was a problem hiding this comment.
Yeah, it's not the prettiest solution & is very much a workaround. It should be reverted once the issue is ironed out in SCons, but that'll require some digging.
akien-mga
approved these changes
Apr 4, 2024
|
Thanks! |
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.
Incorporates a handful of fixes brought up in the initial Ninja PR1, allowing MSVC builds to successfully compile.
Footnotes
https://github.com/godotengine/godot/pull/89452#issuecomment-2028338110 ↩