Build android bullet-native on Travis #1175
Merged
Conversation
This file contains hidden or 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
…ild of jme3-android. This works because jme3-android-native already depends on jme3-android. Due to technical reasons, the headers share the same location and thus the include directives have been adjusted slightly.
…and generate bullet-native headers during jme3-bullet compilation.
Member
|
The conflict resolution looks trivial, but I'll leave you to decide whether to resolve it or create a new PR. |
Member
Author
|
Odd. Now AppVeyor is run and fails for a good reason. I'll look into it. |
Member
|
Is this ready for integration? |
Member
Author
|
It's ready, the deployment changes can then be done together with #1171. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
See #1171 for details. Note that #1171 has to be merged first (as this PR is based on it).
Also note that the deployment has to be thought of much like with #1171.
This also touches jme3-bullet-native, which should now compile a bit faster and cleaner (no intermediary files and two-pass-compilation).
Actually I wonder If I should re-open this PR once #1171 is merged into core, so this PR only contains one Commit?