Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] SCons: Refactor module defines into a generated header, cleanup #50466

Merged
merged 3 commits into from
Jul 14, 2021

Conversation

akien-mga
Copy link
Member

Backport of #35963 for 3.4+. Initially I hadn't planned to backport this but since the 3.2 branch turned into a long-lived 3.x development branch, it becomes relevant to backport.

akien-mga and others added 3 commits July 14, 2021 23:09
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.

(cherry picked from commit b7297fb)
- 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.

(cherry picked from commit f3726ee)
Sometimes scons doesn't detects that a new module is being added. This commit fix it.

(cherry picked from commit b667e72)
@akien-mga akien-mga added this to the 3.4 milestone Jul 14, 2021
@akien-mga akien-mga requested review from a team as code owners July 14, 2021 21:47
@akien-mga akien-mga changed the title SCons: Generate header with info on which modules are enabled [3.x] SCons: Refactor module defines into a generated header, cleanup Jul 14, 2021
@akien-mga akien-mga merged commit 669bf7c into godotengine:3.x Jul 14, 2021
@akien-mga akien-mga deleted the 3.x-scons-modules-enabled-header branch July 14, 2021 22:49
Xrayez added a commit to goostengine/goost that referenced this pull request Jul 15, 2021
Tests without svg module enabled were failing due to godotengine/godot#50466.
Xrayez added a commit to goostengine/goost that referenced this pull request Jul 15, 2021
Tests without svg module enabled were failing due to godotengine/godot#50466.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants