Fix python 3 build in osx-specific platform #11904
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
hoelzl
added a commit
to hoelzl/godot
that referenced
this pull request
Oct 24, 2017
- Cherry picked godotengine#10662 and fixed merge conflicts. - Manualy merged the change from godotengine#11904. - Did not merge godotengine#12236 since I'm not sure whether the issue affects Godot 2.1 and I don't have VS2013 to test. - Did not merge godotengine#11843 since it doesn't seem relevant (the code is only needed for creating DONORS.md, etc.). - Did not merge godotengine#10727 and godotengine#11752 since they seem to be already included in godotengine#11742. - The Windows and Linux builds have been tested with Scons 3.0 using Python 3. - OSX and iOS should hopefully work but are not tested since I don't have a Mac. - Builds using SCons 2.5 and Python 2 should not be impacted.
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.
Removes the legacy
has_keyto make python3 compile for the osx platform, addresses issue #11903 - fails now at what I suspect #11843 will fix!