From fbcf667b6a57593a2b85622ad1e1380c8aef7210 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 12 Oct 2015 14:39:28 -0400
Subject: CREATE_PROJECT: Cleanup and turn off exception handling again
---
devtools/create_project/create_project.cpp | 8 +++++++-
devtools/create_project/msbuild.cpp | 5 ++---
2 files changed, 9 insertions(+), 4 deletions(-)
(limited to 'devtools/create_project')
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 0611646eab..0aba511491 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -471,6 +471,8 @@ int main(int argc, char *argv[]) {
// 4512 ('class' : assignment operator could not be generated)
// some classes use const items and the default assignment operator cannot be generated
//
+ // 4577 ('noexcept' used with no exception handling mode specified)
+ //
// 4702 (unreachable code)
// mostly thrown after error() calls (marked as NORETURN)
//
@@ -513,7 +515,6 @@ int main(int argc, char *argv[]) {
globalWarnings.push_back("4127");
globalWarnings.push_back("4244");
globalWarnings.push_back("4250");
- globalWarnings.push_back("4267");
globalWarnings.push_back("4310");
globalWarnings.push_back("4345");
globalWarnings.push_back("4351");
@@ -527,6 +528,11 @@ int main(int argc, char *argv[]) {
globalWarnings.push_back("6385");
globalWarnings.push_back("6386");
+ if (msvcVersion == 14) {
+ globalWarnings.push_back("4267");
+ globalWarnings.push_back("4577");
+ }
+
projectWarnings["agi"].push_back("4510");
projectWarnings["agi"].push_back("4610");
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 4698ebd303..a326bd721a 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -319,8 +319,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
for (StringList::const_iterator i = setup.libraries.begin(); i != setup.libraries.end(); ++i)
libraries += *i + ".lib;";
- if (_version == 14)
- {
+ if (_version == 14) {
std::string debug = isRelease ? "" : "d";
libraries += "libvcruntime" + debug + ".lib;";
libraries += "libucrt" + debug + ".lib;";
@@ -383,7 +382,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
"\t\t\t" << warnings << ";%(DisableSpecificWarnings)\n"
"\t\t\t$(" << LIBS_DEFINE << ")\\include;.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)\n"
"\t\t\t" << definesList << "%(PreprocessorDefinitions)\n"
- "\t\t\t" << ((setup.devTools || setup.tests || _version == 14) ? "Sync" : "") << "\n";
+ "\t\t\t" << ((setup.devTools || setup.tests) ? "Sync" : "") << "\n";
#if NEEDS_RTTI
properties << "\t\t\ttrue\n";
--
cgit v1.2.3