From add058a8b81c1056013c1c02e17cb24151896bbc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 12 Aug 2016 20:18:20 -0400
Subject: CREATE_PROJECT: Add warning C4373 to ignore list for SCI engine

---
 devtools/create_project/create_project.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'devtools/create_project/create_project.cpp')

diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7e2cad0901..8841eaa73d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -524,6 +524,8 @@ int main(int argc, char *argv[]) {
 		// 4355 ('this' : used in base member initializer list)
 		//   only disabled for specific engines where it is used in a safe way
 		//
+		// 4373 (previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers)
+		//
 		// 4510 ('class' : default constructor could not be generated)
 		//
 		// 4511 ('class' : copy constructor could not be generated)
@@ -573,6 +575,8 @@ int main(int argc, char *argv[]) {
 
 		projectWarnings["m4"].push_back("4355");
 
+		projectWarnings["sci"].push_back("4373");
+
 		if (msvcVersion == 9)
 			provider = new CreateProjectTool::VisualStudioProvider(globalWarnings, projectWarnings, msvcVersion);
 		else
-- 
cgit v1.2.3


From c69eb82527c356a9a65b83ee724e614b74c1f782 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 22 Aug 2016 13:09:49 +0300
Subject: CREATE_PROJECT: Switch SDL backend to SDL2 by default

This adapts create_project with the changes in de04a68c06
---
 devtools/create_project/create_project.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'devtools/create_project/create_project.cpp')

diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 8841eaa73d..70781ffb55 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -284,8 +284,8 @@ int main(int argc, char *argv[]) {
 			setup.devTools = true;
 		} else if (!std::strcmp(argv[i], "--tests")) {
 			setup.tests = true;
-		} else if (!std::strcmp(argv[i], "--sdl2")) {
-			setup.useSDL2 = true;
+		} else if (!std::strcmp(argv[i], "--sdl1")) {
+			setup.useSDL2 = false;
 		} else {
 			std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n";
 			return -1;
@@ -700,7 +700,7 @@ void displayHelp(const char *exe) {
 	        " --disable-<name>         disable inclusion of the feature \"name\"\n"
 	        "\n"
 	        "SDL settings:\n"
-	        " --sdl2                   link to SDL 2.0, instead of SDL 1.2\n"
+	        " --sdl1                   link to SDL 1.2, instead of SDL 2.0\n"
 	        "\n"
 	        " There are the following features available:\n"
 	        "\n";
-- 
cgit v1.2.3