diff options
| author | Filippos Karapetis | 2009-12-07 09:54:55 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-07 09:54:55 +0000 |
| commit | 28fce4383320b9e4028d27a0c7feec044697ea87 (patch) | |
| tree | e8afcafdea9fd58380bb377d82ce3fa54aebc682 /tools | |
| parent | 2797a3bd9ddc457aa2488e6129f4ce97df6fa7fe (diff) | |
| download | scummvm-rg350-28fce4383320b9e4028d27a0c7feec044697ea87.tar.gz scummvm-rg350-28fce4383320b9e4028d27a0c7feec044697ea87.tar.bz2 scummvm-rg350-28fce4383320b9e4028d27a0c7feec044697ea87.zip | |
Disabled language extensions in the generated MSVC project files (refer to patch #2909854)
svn-id: r46274
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/create_msvc/create_msvc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index d27145fd12..27ee5f64b9 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -849,11 +849,13 @@ void createProjectFile(const std::string &name, const std::string &uuid, const B // Win32 project << "\t\t<Configuration Name=\"Debug|Win32\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Debug.vsprops\">\n" + "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n" "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n" "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n" "\t\t\t/>\n" "\t\t</Configuration>\n" "\t\t<Configuration Name=\"Release|Win32\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Release.vsprops\">\n" + "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n" "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n" "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n" "\t\t\t/>\n" @@ -864,11 +866,13 @@ void createProjectFile(const std::string &name, const std::string &uuid, const B // re-create the library list, BUT since NASM doesn't link any additional libraries, we can just use the // libraries list created for IA-32. If that changes in the future, we need to adjust this part! project << "\t\t<Configuration Name=\"Debug|x64\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Debug64.vsprops\">\n" + "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n" "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n" "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n" "\t\t\t/>\n" "\t\t</Configuration>\n" "\t\t<Configuration Name=\"Release|x64\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\ScummVM_Release64.vsprops\">\n" + "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n" "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/scummvm.exe\"\n" "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n" "\t\t\t/>\n" @@ -935,6 +939,7 @@ void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string "\t>\n" "\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\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines\"\n" "\t\tPreprocessorDefinitions=\"" << defines << "\"\n" |