Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds macports_clang build flag. #14658

Merged
merged 1 commit into from
Dec 14, 2017
Merged

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Dec 14, 2017

Adds macports_clang build flag to build using clang-5.0 form MacPorts (with OpenMP support).

@ghost
Copy link

ghost commented Dec 14, 2017

Some of the changes are already in #14657

@ghost ghost added this to the 3.0 milestone Dec 14, 2017
@bruvzg
Copy link
Member Author

bruvzg commented Dec 14, 2017

@Noshyaar I removed f3ad142 fixes (same as in #14657) and keep only macports_clang.

@bruvzg bruvzg changed the title Fixes macOS build after f3ad142 and adds macports_clang build flag. Adds macports_clang build flag. Dec 14, 2017
@@ -41,7 +41,7 @@ DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = {

#if defined(__clang__)
# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \
(defined(__APPLE__) && \
(!defined(__MACPORTS__) && defined(__APPLE__) && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add // -- GODOT start -- and // -- GODOT end -- comments around your change so that we know that the code was modified, and mention it in thirdparty/README.md.

@akien-mga akien-mga merged commit ccea45e into godotengine:master Dec 14, 2017
@bruvzg bruvzg deleted the macports-clang branch December 14, 2017 15:11
akien-mga added a commit that referenced this pull request Dec 14, 2017
Minor improvements for #14658 (MacPorts clang support)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants