Allow linking with -lSDL2_mixer to work properly #12633
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
sbc100
approved these changes
Oct 29, 2020
tools/building.py
Outdated
| if library_name in library_map: | ||
| for key, value in library_map[library_name]: | ||
| logger.debug('Mapping library `%s` to settings changes: %s = %s' % (library_name, key, value)) | ||
| shared.Settings.__setattr__(key, value) |
There was a problem hiding this comment.
Does setattr(shared.Settings, key, value) not work here?
There was a problem hiding this comment.
It does, not sure why I didn't do that before...
| @@ -3150,6 +3150,8 @@ def process_libraries(libs, lib_dirs, temp_files): | |||
| if jslibs is not None: | |||
| libraries += [(i, jslib) for jslib in jslibs] | |||
| consumed.append(i) | |||
| elif building.map_and_apply_to_settings(lib): | |||
There was a problem hiding this comment.
Should this just be map_to_settings ? I'm not sure either is that descriptive so I'm fine either way.
I guess if it was called map_to_settings then it would return the new settings and you would apply it here?
There was a problem hiding this comment.
I considered that, but then returning a list of key mappings and applying them seems odd. a pretty complex interface, compared to just applying them there.
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 did not just work because we build
libSDL2_mixer_oggetc., with a suffixfor the codecs we build in. This PR adds an explicit mapping to handle such
cases.
Also improve the test to check this, and add a lot more checks there, like that
we don't use SDL1 somehow (which can happen with files like this where the
SDL1 and SDL2 APIs agree, and so SDL2 does not need to be linked in to
get a running executable).
Fixes #12589