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

CREATE_PROJECT: Enable C++11 for Xcode builds #2493

Closed
wants to merge 1 commit into from

Conversation

@ccawley2011
Copy link
Member

@ccawley2011 ccawley2011 commented Oct 4, 2020

This appears to fix the GitHub Actions build, but I haven't done any testing beyond that.

@ccawley2011 ccawley2011 requested a review from criezy Oct 4, 2020
@criezy
Copy link
Member

@criezy criezy commented Oct 4, 2020

Since we define a cxx11 feature in create_project.cpp (that is enabled by default, but can be disabled with --disable-cxx11) maybe the code should check for that?

if (CONTAINS_DEFINE(setup.defines, "USE_CXX11")) {
	ADD_SETTING(scummvm_Debug, "CLANG_CXX_LANGUAGE_STANDARD", "\"c++0x\"");
}
@criezy
Copy link
Member

@criezy criezy commented Oct 4, 2020

I am testing this locally.
So far I confirmed that:

  • current master fails to compile in Xcode when we do not disable c++11
  • this PR with my additional suggestion fixes the issue when we do not disable c++11
  • I am currently checking that is also works when using --disable-cxx11
@criezy
Copy link
Member

@criezy criezy commented Oct 4, 2020

Test completed and all works well. I have merged the amended commit manually.
Thanks for your work.

@criezy criezy closed this Oct 4, 2020
@ccawley2011 ccawley2011 deleted the ccawley2011:xcode-c++11 branch Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.