SCons: Refactor module defines into a generated header, cleanup #35963
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 Feb 6, 2020
|
While it compiles fine, it seems not to work as expected currently. Module-specific features seem disable in an editor build with all modules theoretically enabled. No GDScript support, no TLS support, no GridMap, etc. |
akien-mga
changed the title
Ah lol, I found out why. I forgot that all modules are registered in |
We already had `MODULE_*_ENABLED` defines but only in the modules environment, and a few custom `*_ENABLED` defines in the main env when we needed the information in core. Now this is defined in a single header which can be included in the files that need this information.
- Fix build with gdscript module disabled. Fixes godotengine#31011. - Remove unused `gdscript` compile option. - Fix build with regex module disabled. - Fix ImageLoaderSVG to forward declare thirdparty structs.
akien-mga
force-pushed
the
scons-modules-enabled-header
branch
from
e44d41d
to
f3726ee
Compare
akien-mga
changed the title
|
Tested successfully with:
|
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 supersedes #32453, which aimed at having all
MODULE_*_ENABLEDdefines in a header to be able to do proper checks that modules are enabled before using them in other folders (especially inRichTextLabelwhich usesRegEx).It also supersedes #32781 and fixes #31011, allowing to compile with GDScript disabled again.
Those two could have been solved with less work via more custom defines, but the new approach was discussed as cleaner and overall more resilient with @punto- and @Faless. Having all the defines in a header allow us to only include this header where needed instead of passing hacks like
SVG_ENABLEDandFREETYPE_ENABLEDto the main environment.In the process of fixing this, we found that the removal of
env_modules.Append(CPPDEFINES=["MODULE_" + x.upper() + "_ENABLED"])actually triggers linking order issues. I'm not sure why these defines prevented the issue, but after debugging with @Faless we found that the best is likely to ensure thatlibmodules.acomes last on the linker command.There was then still one issue with
script_encryption_keywhich is defined in a.gen.cppin core, and was thus part oflibcore.a, triggering another linking issue. I made it a.gen.hto solve it -- was there any reason for it to be a.cppand not a.hin the first place?In a follow-up PR, I might add a few changes to split
libmodules.ainto multiplelibmodule_$name.a, which should also remove the need for thesplit_libmoduleshack on Windows (#34227).