Ticket #9120: create_msvc_disable_warnings.patch

tools/create_msvc/create_msvc.cpp

@@ -90 +90 @@
 void displayHelp(const char *exe);
 } // End of anonymous namespace
 
+// Map containing a project-specific list of warnings
+static std::map<std::string, std::string> project_warnings;
+static std::string global_warnings;
+
 int main(int argc, char *argv[]) {
 #if !(defined(_WIN32) || defined(WIN32))
         // Initialize random number generator for UUID creation
@@ -241 +245 @@
         setup.libraries.push_back("winmm.lib");
         setup.libraries.push_back("sdl.lib");
 
+        // Initialize global & project-specific warnings
+        global_warnings = "4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996";
+
+        project_warnings["agi"] = "4510;4610";
+        project_warnings["lure"] = "4189";
+
         createMSVCProject(setup, msvcVersion);
 }
 
@@ -841 +851 @@
                    "\t</Platforms>\n"
                    "\t<Configurations>\n";
 
+        // Check for project-specific warnings:
+        std::map<std::string, std::string>::iterator warnings = project_warnings.find(name);
+
         if (name == "scummvm") {
                 std::string libraries;
 
@@ -877 +890 @@
                            "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
                            "\t\t\t/>\n"
                            "\t\t</Configuration>\n";
+        } else if (warnings != project_warnings.end()) {
+                // Win32
+                project << "\t\t<Configuration Name=\"Debug|Win32\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\ScummVM_Debug.vsprops\">\n"
+                           "\t\t\t<Tool Name=\"VCCLCompilerTool\" DisableSpecificWarnings=\"" << warnings->second << "\" />\n"
+                           "\t\t</Configuration>\n"
+                           "\t\t<Configuration Name=\"Release|Win32\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\ScummVM_Release.vsprops\">\n"
+                                   "\t\t\t<Tool Name=\"VCCLCompilerTool\" DisableSpecificWarnings=\"" << warnings->second << "\" />\n"
+                                   "\t\t</Configuration>\n";
+                // x64
+                project << "\t\t<Configuration Name=\"Debug|x64\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\ScummVM_Debug64.vsprops\">\n"
+                           "\t\t\t<Tool Name=\"VCCLCompilerTool\" DisableSpecificWarnings=\"" << warnings->second << "\" />\n"
+                           "\t\t</Configuration>\n"
+                           "\t\t<Configuration Name=\"Release|x64\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\ScummVM_Release64.vsprops\">\n"
+                                   "\t\t\t<Tool Name=\"VCCLCompilerTool\" DisableSpecificWarnings=\"" << warnings->second << "\" />\n"
+                                   "\t\t</Configuration>\n";
         } else if (name == "tinsel") {
                 // Win32
                 project << "\t\t<Configuration Name=\"Debug|Win32\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\ScummVM_Debug.vsprops\">\n"
@@ -940 +968 @@
                       "\t<Tool\n"
                       "\t\tName=\"VCCLCompilerTool\"\n"
                       "\t\tDisableLanguageExtensions=\"true\"\n"
-                      "\t\tDisableSpecificWarnings=\"4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4267;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996\"\n"
+                      "\t\tDisableSpecificWarnings=\"" << global_warnings << "\"\n"
                       "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines\"\n"
                       "\t\tPreprocessorDefinitions=\"" << defines << "\"\n"
                       "\t\tExceptionHandling=\"0\"\n"