From c43ce9ecf3ed2542173b8c438a9e9e1c44bf1f21 Mon Sep 17 00:00:00 2001 From: Joel Teichroeb Date: Thu, 19 Jun 2014 18:21:14 -0700 Subject: 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. --- devtools/create_project/create_project.cpp | 5 +- .../create_project/msvc10/create_project.vcxproj | 2 - .../create_project/msvc11/create_project.vcxproj | 2 - .../create_project/msvc12/create_project.vcxproj | 2 - devtools/create_project/msvc8/create_project.sln | 20 -- .../create_project/msvc8/create_project.vcproj | 251 --------------------- devtools/create_project/visualstudio.cpp | 8 +- 7 files changed, 4 insertions(+), 286 deletions(-) delete mode 100644 devtools/create_project/msvc8/create_project.sln delete mode 100644 devtools/create_project/msvc8/create_project.vcproj (limited to 'devtools/create_project') 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 @@ @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\" @@ -87,7 +86,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @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\" 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\" @@ -93,7 +92,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" 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\" 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\" @@ -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\" 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 &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\n" -- cgit v1.2.3 From 59036a40cea19cba32a5ceffc35a05efa03f52a3 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 22 Jun 2014 02:02:05 +0200 Subject: DEVTOOLS: List MSVC 2013 support in create_project's help output. --- devtools/create_project/create_project.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 5fadfebbf3..e71816f575 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -622,6 +622,7 @@ void displayHelp(const char *exe) { " 9 stands for \"Visual Studio 2008\"\n" " 10 stands for \"Visual Studio 2010\"\n" " 11 stands for \"Visual Studio 2012\"\n" + " 12 stands for \"Visual Studio 2013\"\n" " The default is \"9\", thus \"Visual Studio 2008\"\n" " --build-events Run custom build events as part of the build\n" " (default: false)\n" -- cgit v1.2.3 From 536203b352f66d326e1c6e93942cf0a1adba8e99 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Wed, 25 Jun 2014 20:14:17 +0100 Subject: DEVTOOLS: Add "small" vkeybd pack to create_project postbuild script. --- devtools/create_project/scripts/postbuild.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index 8b70ec3dd8..fcbd8c534a 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -26,7 +26,8 @@ echo. xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1 xcopy /F /Y "%~4/lib/%~3/freetype6.dll" "%~2" 1>NUL 2>&1 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1 -xcopy /F /Y "%~1/gui/themes/translations.dat" "%~2" 1>NUL 2>&1 +xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_small.zip" "%~2" 1>NUL 2>&1 +xcopy /F /Y "%~1/gui/themes/translations.dat" "%~2" 1>NUL 2>&1 if "%~5"=="0" goto done -- cgit v1.2.3 From 79d4f09cabd7dc75ecc691f0c36f08bb514b4d4d Mon Sep 17 00:00:00 2001 From: Pawel Kolodziejski Date: Thu, 17 Jul 2014 13:59:56 +0200 Subject: CREATE_PROJECT/MSVC: allow include SDL includes from SDL subdir --- devtools/create_project/msbuild.cpp | 2 +- devtools/create_project/visualstudio.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'devtools/create_project') diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 018a04370f..87c9066199 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -352,7 +352,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea "\t\t<_PropertySheetDisplayName>" << setup.projectDescription << "_Global\n" "\t\t$(" << LIBS_DEFINE << ")\\bin;$(ExecutablePath)\n" "\t\t$(" << LIBS_DEFINE << ")\\lib\\" << (bits == 32 ? "x86" : "x64") << ";$(LibraryPath)\n" - "\t\t$(" << LIBS_DEFINE << ")\\include;$(IncludePath)\n" + "\t\t$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;$(IncludePath)\n" "\t\t$(Configuration)" << bits << "\\\n" "\t\t$(Configuration)" << bits << "/$(ProjectName)\\\n" "\t\n" diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index b2ed58cb58..9b928bf520 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -228,7 +228,7 @@ void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::of "\t\tName=\"VCCLCompilerTool\"\n" "\t\tDisableLanguageExtensions=\"" << (setup.devTools ? "false" : "true") << "\"\n" "\t\tDisableSpecificWarnings=\"" << warnings << "\"\n" - "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << ";" << prefix << "\\engines;$(" << LIBS_DEFINE << ")\\include;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir)\"\n" + "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << ";" << prefix << "\\engines;$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir)\"\n" "\t\tPreprocessorDefinitions=\"" << definesList << "\"\n" "\t\tExceptionHandling=\"" << ((setup.devTools || setup.tests) ? "1" : "0") << "\"\n"; -- cgit v1.2.3