Make everything ready for macOS with fixes.#64
Merged
martensm merged 11 commits intoetternagame:masterfrom Sep 8, 2017
TheROPFather:master
Merged
Make everything ready for macOS with fixes.#64martensm merged 11 commits intoetternagame:masterfrom TheROPFather:master
martensm merged 11 commits intoetternagame:masterfrom
TheROPFather:master
Conversation
Add the latest calc version recompiled for a 32bit build with threading and vibro removed and added the correct linking path the the CMake.
std::string only gets used in Lua so renamed it to luajoin to remove the ambiguous function.
Namespacing avcodec:: creates issue on macOS interfering with local.c in the stdlib.
Non-constant-expression cannot be narrowed from type 'int' to 'unsigned int' in initializer list
It appears to have no effect on the codebase or execution of the program.
Pulled from the vanilla master branch.
This fix is required for macOS and should probably be ported to all platforms if possible.
Only required for older versions of macOS
martensm
requested changes
Sep 8, 2017
Contributor
martensm
left a comment
There was a problem hiding this comment.
This should be in a separate PR.
martensm
requested changes
Sep 8, 2017
Contributor
martensm
left a comment
There was a problem hiding this comment.
This should be in a separate PR.
martensm
approved these changes
Sep 8, 2017
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
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.
Same PR with the included fixes.