diff options
author | Joel Teichroeb | 2014-06-19 18:21:14 -0700 |
---|---|---|
committer | Joel Teichroeb | 2014-06-21 11:32:45 -0700 |
commit | c43ce9ecf3ed2542173b8c438a9e9e1c44bf1f21 (patch) | |
tree | b83d98bb99df8ba672c1b4d15aa2f2f2fd73b1bc /devtools | |
parent | 8d020ba086f99d8150dc451e3fed36d24af6b4e0 (diff) | |
download | scummvm-rg350-c43ce9ecf3ed2542173b8c438a9e9e1c44bf1f21.tar.gz scummvm-rg350-c43ce9ecf3ed2542173b8c438a9e9e1c44bf1f21.tar.bz2 scummvm-rg350-c43ce9ecf3ed2542173b8c438a9e9e1c44bf1f21.zip |
ALL: Remove support for MSVC8 and older
MSVC8 gives various compile error relating to templates that were changed
back in 2008, leading me to belive that no one is using it, and that there
is not point adding work arounds for a 9 year old compiler no one uses.
Diffstat (limited to 'devtools')
-rw-r--r-- | devtools/README | 2 | ||||
-rw-r--r-- | devtools/create_project/create_project.cpp | 5 | ||||
-rw-r--r-- | devtools/create_project/msvc10/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc11/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc12/create_project.vcxproj | 2 | ||||
-rw-r--r-- | devtools/create_project/msvc8/create_project.sln | 20 | ||||
-rw-r--r-- | devtools/create_project/msvc8/create_project.vcproj | 251 | ||||
-rw-r--r-- | devtools/create_project/visualstudio.cpp | 8 |
8 files changed, 5 insertions, 287 deletions
diff --git a/devtools/README b/devtools/README index 482c24edc2..509048bfe0 100644 --- a/devtools/README +++ b/devtools/README @@ -72,7 +72,7 @@ create_mort (Strangerke) create_project (LordHoto, Littleboy) -------------- - Creates project files for Visual Studio 2005, 2008, 2010, 2012, Xcode and + Creates project files for Visual Studio 2008, 2010, 2012, 2013, Xcode and Code::Blocks out of the configure / Makefile based build system. It also offers a way to enable or disable certain engines and the use of external libraries similar to configure. Run the tool without diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 876c116b5c..5fadfebbf3 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -175,7 +175,7 @@ int main(int argc, char *argv[]) { msvcVersion = atoi(argv[++i]); - if (msvcVersion != 8 && msvcVersion != 9 && msvcVersion != 10 && msvcVersion != 11 && msvcVersion != 12) { + if (msvcVersion != 9 && msvcVersion != 10 && msvcVersion != 11 && msvcVersion != 12) { std::cerr << "ERROR: Unsupported version: \"" << msvcVersion << "\" passed to \"--msvc-version\"!\n"; return -1; } @@ -526,7 +526,7 @@ int main(int argc, char *argv[]) { projectWarnings["m4"].push_back("4355"); - if (msvcVersion == 8 || msvcVersion == 9) + if (msvcVersion == 9) provider = new CreateProjectTool::VisualStudioProvider(globalWarnings, projectWarnings, msvcVersion); else provider = new CreateProjectTool::MSBuildProvider(globalWarnings, projectWarnings, msvcVersion); @@ -619,7 +619,6 @@ void displayHelp(const char *exe) { "\n" "MSVC specific settings:\n" " --msvc-version version set the targeted MSVC version. Possible values:\n" - " 8 stands for \"Visual Studio 2005\"\n" " 9 stands for \"Visual Studio 2008\"\n" " 10 stands for \"Visual Studio 2010\"\n" " 11 stands for \"Visual Studio 2012\"\n" diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 40c515f26b..80dfd5e8d3 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -61,7 +61,6 @@ <Command>@echo off xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -87,7 +86,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> <Command>@echo off xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc11/create_project.vcxproj b/devtools/create_project/msvc11/create_project.vcxproj index c87461c049..8bbd25e9ba 100644 --- a/devtools/create_project/msvc11/create_project.vcxproj +++ b/devtools/create_project/msvc11/create_project.vcxproj @@ -66,7 +66,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -93,7 +92,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc12/create_project.vcxproj b/devtools/create_project/msvc12/create_project.vcxproj index c26b1e5f45..6da1556547 100644 --- a/devtools/create_project/msvc12/create_project.vcxproj +++ b/devtools/create_project/msvc12/create_project.vcxproj @@ -66,7 +66,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> @@ -94,7 +93,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </PostBuildEvent> diff --git a/devtools/create_project/msvc8/create_project.sln b/devtools/create_project/msvc8/create_project.sln deleted file mode 100644 index 4a0152f33f..0000000000 --- a/devtools/create_project/msvc8/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc8/create_project.vcproj b/devtools/create_project/msvc8/create_project.vcproj deleted file mode 100644 index 6e9e0d5cb0..0000000000 --- a/devtools/create_project/msvc8/create_project.vcproj +++ /dev/null @@ -1,251 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="create_project" - ProjectGUID="{CF177559-077D-4A08-AABE-BE0FD35F6C63}" - RootNamespace="create_project" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - WarningLevel="4" - DebugInformationFormat="4" - DisableSpecificWarnings="4003;4512;4127" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Rpcrt4.lib" - GenerateDebugInformation="true" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" - DisableSpecificWarnings="4003;4512;4127" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Rpcrt4.lib" - GenerateDebugInformation="true" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\create_project.cpp" - > - </File> - <File - RelativePath="..\codeblocks.cpp" - > - </File> - <File - RelativePath="..\msvc.cpp" - > - </File> - <File - RelativePath="..\msbuild.cpp" - > - </File> - <File - RelativePath="..\visualstudio.cpp" - > - </File> - <File - RelativePath="..\xcode.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\create_project.h" - > - </File> - <File - RelativePath="..\codeblocks.h" - > - </File> - <File - RelativePath="..\config.h" - > - </File> - <File - RelativePath="..\msvc.h" - > - </File> - <File - RelativePath="..\msbuild.h" - > - </File> - <File - RelativePath="..\visualstudio.h" - > - </File> - <File - RelativePath="..\xcode.h" - > - </File> - </Filter> - <Filter - Name="Scripts" - Filter="vbs;cmd" - UniqueIdentifier="{45B110C8-4C64-4677-8ED6-F9A93C6D55A0}" - > - <File - RelativePath="..\scripts\prebuild.cmd" - > - </File> - <File - RelativePath="..\scripts\postbuild.cmd" - > - </File> - <File - RelativePath="..\scripts\revision.vbs" - > - </File> - <File - RelativePath="..\scripts\installer.vbs" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 84bc674f9a..b2ed58cb58 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -29,7 +29,7 @@ namespace CreateProjectTool { ////////////////////////////////////////////////////////////////////////// -// Visual Studio Provider (Visual Studio 2005 & 2008) +// Visual Studio Provider (Visual Studio 2008) ////////////////////////////////////////////////////////////////////////// VisualStudioProvider::VisualStudioProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version) @@ -48,9 +48,6 @@ int VisualStudioProvider::getVisualStudioVersion() { if (_version == 9) return 2008; - if (_version == 8) - return 2005; - error("Unsupported version passed to getVisualStudioVersion"); } @@ -70,8 +67,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: "\tRootNamespace=\"" << name << "\"\n" "\tKeyword=\"Win32Proj\"\n"; - if (_version >= 9) - project << "\tTargetFrameworkVersion=\"131072\"\n"; + project << "\tTargetFrameworkVersion=\"131072\"\n"; project << "\t>\n" "\t<Platforms>\n" |