Remove last editor code dependencies in template build #59644
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
SConstruct change also makes it possible to outright delete the `editor` folder in a `tools=no` build, which we use in CI to ensure no invalid cross-dependencies are added.
akien-mga
commented
Mar 28, 2022
Comment on lines
+81
to
+82
| // FIXME: Hardcoded to avoid editor dependency. | ||
| #define GLTF_IMPORT_USE_NAMED_SKIN_BINDS 16 |
There was a problem hiding this comment.
This needs further work from @godotengine/import. Either the enum can be replicated, or it should be moved to a non-editor file.
There was a problem hiding this comment.
That's one way to solve it yeah :)
akien-mga
commented
Mar 28, 2022
Comment on lines
+258
to
+263
| #ifdef TOOLS_ENABLED | ||
| ResourceImporterWAV::_compress_ima_adpcm(left, bleft); | ||
| ResourceImporterWAV::_compress_ima_adpcm(right, bright); | ||
| #else | ||
| ERR_PRINT("AudioEffectRecord cannot do IMA ADPCM compression at runtime."); | ||
| #endif |
There was a problem hiding this comment.
This will have to be reworked @godotengine/audio.
Either ResourceImporterWAV::_compress_ima_adpcm should be moved to core or servers, or this should be changed to ensure this is editor only code (and thus moved to an import plugin?).
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.
SConstruct change (+ previous PRs #59631 #59635 #59636) also makes it possible to outright delete the
editorfolder in atools=nobuild, which we use in CI to ensure no invalid cross-dependencies are added.Part of #53295.
Note that there are still
editordependencies inscenecode, but the remaining ones are enclosed in#ifdef TOOLS_ENABLEDi.e. they're only used in actual editor builds.