Ticket #9119: create_msvc_disable_language_extensions.patch

File create_msvc_disable_language_extensions.patch, 2.7 KB (added by Templier, 14 years ago)

Patch for MSVC

  • tools/create_msvc/create_msvc.cpp

     
    849849
    850850                // Win32
    851851                project << "\t\t<Configuration Name=\"Debug|Win32\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Debug.vsprops\">\n"
     852                                   "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
    852853                           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n"
    853854                           "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
    854855                           "\t\t\t/>\n"
    855856                           "\t\t</Configuration>\n"
    856857                           "\t\t<Configuration Name=\"Release|Win32\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Release.vsprops\">\n"
     858                                   "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
    857859                           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n"
    858860                           "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
    859861                           "\t\t\t/>\n"
     
    864866                // re-create the library list, BUT since NASM doesn't link any additional libraries, we can just use the
    865867                // libraries list created for IA-32. If that changes in the future, we need to adjust this part!
    866868                project << "\t\t<Configuration Name=\"Debug|x64\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Debug64.vsprops\">\n"
     869                                   "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
    867870                           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n"
    868871                           "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
    869872                           "\t\t\t/>\n"
    870873                           "\t\t</Configuration>\n"
    871874                           "\t\t<Configuration Name=\"Release|x64\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Release64.vsprops\">\n"
     875                                   "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
    872876                           "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n"
    873877                           "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
    874878                           "\t\t\t/>\n"
     
    935939                      "\t>\n"
    936940                      "\t<Tool\n"
    937941                      "\t\tName=\"VCCLCompilerTool\"\n"
     942                                  "\t\tDisableLanguageExtensions=\"true\"\n"
    938943                      "\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"
    939944                      "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines\"\n"
    940945                      "\t\tPreprocessorDefinitions=\"" << defines << "\"\n"