[Scummvm-git-logs] scummvm master -> 76778e100f745fe3a2a72765becea6719020f233
bluegr
bluegr at gmail.com
Sun Nov 7 09:36:51 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
76778e100f CREATE_PROJECT: Remove VS2008 project generator
Commit: 76778e100f745fe3a2a72765becea6719020f233
https://github.com/scummvm/scummvm/commit/76778e100f745fe3a2a72765becea6719020f233
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-11-07T11:36:49+02:00
Commit Message:
CREATE_PROJECT: Remove VS2008 project generator
Now that C++11 is mandatory we can retire our old friend
Changed paths:
R devtools/create_project/msvc/create_project_2008.sln
R devtools/create_project/msvc/create_project_2008.vcproj
R devtools/create_project/visualstudio.cpp
R devtools/create_project/visualstudio.h
devtools/create_project/cmake/CMakeLists.txt
devtools/create_project/codeblocks/create_project.cbp
devtools/create_project/create_project.cpp
devtools/create_project/module.mk
devtools/create_project/msvc/create_project.vcxproj
devtools/create_project/msvc/create_project.vcxproj.filters
devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj
diff --git a/devtools/create_project/cmake/CMakeLists.txt b/devtools/create_project/cmake/CMakeLists.txt
index 5c546656cd..e247257b21 100644
--- a/devtools/create_project/cmake/CMakeLists.txt
+++ b/devtools/create_project/cmake/CMakeLists.txt
@@ -13,8 +13,6 @@ set(SOURCE_FILES
../msbuild.h
../msvc.cpp
../msvc.h
- ../visualstudio.cpp
- ../visualstudio.h
../xcode.cpp
../xcode.h
)
diff --git a/devtools/create_project/codeblocks/create_project.cbp b/devtools/create_project/codeblocks/create_project.cbp
index b015577f5e..981057e1c7 100644
--- a/devtools/create_project/codeblocks/create_project.cbp
+++ b/devtools/create_project/codeblocks/create_project.cbp
@@ -47,8 +47,6 @@
<Unit filename="..\msbuild.h" />
<Unit filename="..\msvc.cpp" />
<Unit filename="..\msvc.h" />
- <Unit filename="..\visualstudio.cpp" />
- <Unit filename="..\visualstudio.h" />
<Unit filename="..\xcode.cpp" />
<Unit filename="..\xcode.h" />
<Extensions>
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 8f901e6829..55cf9d99a0 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -44,7 +44,6 @@
#include "codeblocks.h"
#include "msbuild.h"
#include "msvc.h"
-#include "visualstudio.h"
#include "xcode.h"
#include <algorithm>
@@ -629,10 +628,7 @@ int main(int argc, char *argv[]) {
projectWarnings["sci"].push_back("4373");
- if (msvcVersion == 9)
- provider = new CreateProjectTool::VisualStudioProvider(globalWarnings, projectWarnings, msvcVersion, *msvc);
- else
- provider = new CreateProjectTool::MSBuildProvider(globalWarnings, projectWarnings, msvcVersion, *msvc);
+ provider = new CreateProjectTool::MSBuildProvider(globalWarnings, projectWarnings, msvcVersion, *msvc);
break;
@@ -1139,7 +1135,6 @@ const Tool s_tools[] = {
const MSVCVersion s_msvc[] = {
// Ver Name Solution Project Toolset LLVM
- { 9, "Visual Studio 2008", "10.00", "2008", "4.0", "v90", "LLVM-vs2008" },
{ 10, "Visual Studio 2010", "11.00", "2010", "4.0", "v100", "LLVM-vs2010" },
{ 11, "Visual Studio 2012", "11.00", "2012", "4.0", "v110", "LLVM-vs2012" },
{ 12, "Visual Studio 2013", "12.00", "2013", "12.0", "v120", "LLVM-vs2013" },
diff --git a/devtools/create_project/module.mk b/devtools/create_project/module.mk
index bb7bdcc9b0..1260363b3f 100644
--- a/devtools/create_project/module.mk
+++ b/devtools/create_project/module.mk
@@ -6,7 +6,6 @@ MODULE_OBJS := \
create_project.o \
codeblocks.o \
msvc.o \
- visualstudio.o \
msbuild.o \
xcode.o
diff --git a/devtools/create_project/msvc/create_project.vcxproj b/devtools/create_project/msvc/create_project.vcxproj
index f582ebbbb0..16a7cee9ab 100644
--- a/devtools/create_project/msvc/create_project.vcxproj
+++ b/devtools/create_project/msvc/create_project.vcxproj
@@ -98,7 +98,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"</Command>
<ClCompile Include="..\create_project.cpp" />
<ClCompile Include="..\msbuild.cpp" />
<ClCompile Include="..\msvc.cpp" />
- <ClCompile Include="..\visualstudio.cpp" />
<ClCompile Include="..\xcode.cpp" />
</ItemGroup>
<ItemGroup>
@@ -108,7 +107,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"</Command>
<ClInclude Include="..\create_project.h" />
<ClInclude Include="..\msbuild.h" />
<ClInclude Include="..\msvc.h" />
- <ClInclude Include="..\visualstudio.h" />
<ClInclude Include="..\xcode.h" />
</ItemGroup>
<ItemGroup>
diff --git a/devtools/create_project/msvc/create_project.vcxproj.filters b/devtools/create_project/msvc/create_project.vcxproj.filters
index b29f1d2989..a04695231a 100644
--- a/devtools/create_project/msvc/create_project.vcxproj.filters
+++ b/devtools/create_project/msvc/create_project.vcxproj.filters
@@ -24,9 +24,6 @@
<ClInclude Include="..\msbuild.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\visualstudio.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\xcode.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -50,9 +47,6 @@
<ClCompile Include="..\msbuild.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\visualstudio.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\xcode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/devtools/create_project/msvc/create_project_2008.sln b/devtools/create_project/msvc/create_project_2008.sln
deleted file mode 100644
index 4eaa6f04df..0000000000
--- a/devtools/create_project/msvc/create_project_2008.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project_2008.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/msvc/create_project_2008.vcproj b/devtools/create_project/msvc/create_project_2008.vcproj
deleted file mode 100644
index d41fe80933..0000000000
--- a/devtools/create_project/msvc/create_project_2008.vcproj
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="create_project"
- ProjectGUID="{CF177559-077D-4A08-AABE-BE0FD35F6C63}"
- RootNamespace="create_project"
- TargetFrameworkVersion="196613"
- >
- <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;4100;4244"
- />
- <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"
- CommandLine="@echo off
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\""
- />
- </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"
- CommandLine="@echo off
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\""
- />
- </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="..\cmake.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="..\cmake.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;bat;natvis"
- 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>
- <File
- RelativePath="..\scripts\scummvm.natvis"
- >
- </File>
- <File
- RelativePath="..\scripts\install-natvis.bat"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
deleted file mode 100644
index 459e0fdace..0000000000
--- a/devtools/create_project/visualstudio.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "visualstudio.h"
-#include "config.h"
-
-#include <algorithm>
-#include <fstream>
-
-namespace CreateProjectTool {
-
-//////////////////////////////////////////////////////////////////////////
-// Visual Studio Provider (Visual Studio 2008)
-//////////////////////////////////////////////////////////////////////////
-
-VisualStudioProvider::VisualStudioProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc)
- : MSVCProvider(global_warnings, project_warnings, version, msvc) {
-
- _archs.push_back(ARCH_X86);
- _archs.push_back(ARCH_AMD64);
-}
-
-const char *VisualStudioProvider::getProjectExtension() {
- return ".vcproj";
-}
-
-const char *VisualStudioProvider::getPropertiesExtension() {
- return ".vsprops";
-}
-
-void VisualStudioProvider::createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList) {
- const std::string projectFile = setup.outputDir + '/' + name + getProjectExtension();
- std::ofstream project(projectFile.c_str());
- if (!project || !project.is_open()) {
- error("Could not open \"" + projectFile + "\" for writing");
- return;
- }
-
- project << "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n"
- << "<VisualStudioProject\n"
- << "\tProjectType=\"Visual C++\"\n"
- << "\tVersion=\"" << _version << ".00\"\n"
- << "\tName=\"" << name << "\"\n"
- << "\tProjectGUID=\"{" << uuid << "}\"\n"
- << "\tRootNamespace=\"" << name << "\"\n"
- << "\tKeyword=\"Win32Proj\"\n";
-
- project << "\tTargetFrameworkVersion=\"131072\"\n";
-
- project << "\t>\n"
- "\t<Platforms>\n";
- for (std::list<MSVC_Architecture>::const_iterator arch = _archs.begin(); arch != _archs.end(); ++arch) {
- project << "\t\t<Platform Name=\"" << getMSVCConfigName(*arch) << "\" />\n";
- }
- project << "\t</Platforms>\n"
- << "\t<Configurations>\n";
-
- // Check for project-specific warnings:
- std::map<std::string, std::list<std::string> >::iterator warningsIterator = _projectWarnings.find(name);
-
- if (setup.devTools || setup.tests || name == setup.projectName) {
- for (std::list<MSVC_Architecture>::const_iterator arch = _archs.begin(); arch != _archs.end(); ++arch) {
- outputConfiguration(project, setup, false, "Debug", *arch);
- outputConfiguration(project, setup, false, "Analysis", *arch);
- outputConfiguration(project, setup, false, "LLVM", *arch);
- outputConfiguration(project, setup, true, "Release", *arch);
- }
-
- } else {
- bool enableLanguageExtensions = find(_enableLanguageExtensions.begin(), _enableLanguageExtensions.end(), name) != _enableLanguageExtensions.end();
- bool disableEditAndContinue = find(_disableEditAndContinue.begin(), _disableEditAndContinue.end(), name) != _disableEditAndContinue.end();
-
- std::string warnings = "";
- if (warningsIterator != _projectWarnings.end())
- for (StringList::const_iterator i = warningsIterator->second.begin(); i != warningsIterator->second.end(); ++i)
- warnings += *i + ';';
-
- std::string toolConfig;
- toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : "");
- toolConfig += (disableEditAndContinue ? "DebugInformationFormat=\"3\" " : "");
- toolConfig += (enableLanguageExtensions ? "DisableLanguageExtensions=\"false\" " : "");
-
- for (std::list<MSVC_Architecture>::const_iterator arch = _archs.begin(); arch != _archs.end(); ++arch) {
- outputConfiguration(setup, project, toolConfig, "Debug", *arch);
- outputConfiguration(setup, project, toolConfig, "Analysis", *arch);
- outputConfiguration(setup, project, toolConfig, "LLVM", *arch);
- outputConfiguration(setup, project, toolConfig, "Release", *arch);
- }
- }
-
- project << "\t</Configurations>\n"
- << "\t<Files>\n";
-
- std::string modulePath;
- if (!moduleDir.compare(0, setup.srcDir.size(), setup.srcDir)) {
- modulePath = moduleDir.substr(setup.srcDir.size());
- if (!modulePath.empty() && modulePath.at(0) == '/')
- modulePath.erase(0, 1);
- }
-
- if (!modulePath.empty())
- addFilesToProject(moduleDir, project, includeList, excludeList, setup.filePrefix + '/' + modulePath);
- else
- addFilesToProject(moduleDir, project, includeList, excludeList, setup.filePrefix);
-
- // Output auto-generated test runner
- if (setup.tests) {
- project << "\t\t<File RelativePath=\"test_runner.cpp\" />\n";
- }
-
- project << "\t</Files>\n"
- << "</VisualStudioProject>\n";
-}
-
-void VisualStudioProvider::outputConfiguration(std::ostream &project, const BuildSetup &setup, bool isRelease, const std::string &config, const MSVC_Architecture arch) {
- std::string libraries = outputLibraryDependencies(setup, isRelease);
-
- project << "\t\t<Configuration Name=\"" << config << "|" << getMSVCConfigName(arch) << "\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\" << setup.projectDescription << "_" << config << getMSVCArchName(arch) << ".vsprops\">\n"
- << "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" DebugInformationFormat=\"3\" />\n"
- << "\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/" << setup.projectName << ".exe\"\n"
- << "\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
- << "\t\t\t/>\n";
- outputBuildEvents(project, setup, arch);
- project << "\t\t</Configuration>\n";
-}
-
-void VisualStudioProvider::outputConfiguration(const BuildSetup &setup, std::ostream &project, const std::string &toolConfig, const std::string &config, const MSVC_Architecture arch) {
- project << "\t\t<Configuration Name=\"" << config << "|" << getMSVCConfigName(arch) << "\" ConfigurationType=\"4\" InheritedPropertySheets=\".\\" << setup.projectDescription << "_" << config << getMSVCArchName(arch) << ".vsprops\">\n"
- << "\t\t\t<Tool Name=\"VCCLCompilerTool\" " << toolConfig << "/>\n"
- << "\t\t</Configuration>\n";
-}
-
-void VisualStudioProvider::outputBuildEvents(std::ostream &project, const BuildSetup &setup, const MSVC_Architecture arch) {
- if (!setup.devTools && !setup.tests && setup.runBuildEvents) {
- project << "\t\t\t<Tool\tName=\"VCPreBuildEventTool\"\n"
- << "\t\t\t\tCommandLine=\"" << getPreBuildEvent() << "\"\n"
- << "\t\t\t/>\n"
- << "\t\t\t<Tool\tName=\"VCPostBuildEventTool\"\n"
- << "\t\t\t\tCommandLine=\"" << getPostBuildEvent(arch, setup) << "\"\n"
- << "\t\t\t/>\n";
- }
-
- // Generate runner file before build for tests
- if (setup.tests) {
- project << "\t\t\t<Tool\tName=\"VCPreBuildEventTool\"\n"
- << "\t\t\t\tCommandLine=\"" << getTestPreBuildEvent(setup) << "\"\n"
- << "\t\t\t/>\n";
-
- project << "\t\t\t<Tool\tName=\"VCPostBuildEventTool\"\n"
- << "\t\t\t\tCommandLine=\"$(TargetPath)\" IgnoreExitCode=\"true\"\n"
- << "\t\t\t/>\n";
- }
-}
-
-void VisualStudioProvider::writeReferences(const BuildSetup &setup, std::ofstream &output) {
- output << "\tProjectSection(ProjectDependencies) = postProject\n";
-
- for (UUIDMap::const_iterator i = _engineUuidMap.begin(); i != _engineUuidMap.end(); ++i) {
- output << "\t\t{" << i->second << "} = {" << i->second << "}\n";
- }
-
- output << "\tEndProjectSection\n";
-}
-
-void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstream &properties, MSVC_Architecture arch, const StringList &defines, const std::string &prefix, bool runBuildEvents) {
- std::string warnings;
- for (StringList::const_iterator i = _globalWarnings.begin(); i != _globalWarnings.end(); ++i)
- warnings += *i + ';';
-
- std::string includeDirsList;
- for (StringList::const_iterator i = setup.includeDirs.begin(); i != setup.includeDirs.end(); ++i)
- includeDirsList += convertPathToWin(*i) + ';';
-
- std::string definesList;
- for (StringList::const_iterator i = defines.begin(); i != defines.end(); ++i) {
- if (i != defines.begin())
- definesList += ';';
- definesList += *i;
- }
-
- // Add define to include revision header
- if (runBuildEvents)
- definesList += REVISION_DEFINE ";";
-
- properties << "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n"
- << "<VisualStudioPropertySheet\n"
- << "\tProjectType=\"Visual C++\"\n"
- << "\tVersion=\"8.00\"\n"
- << "\tName=\"" << setup.projectDescription << "_Global\"\n"
- << "\tOutputDirectory=\"$(ConfigurationName)" << getMSVCArchName(arch) << "\"\n"
- << "\tIntermediateDirectory=\"$(ConfigurationName)" << getMSVCArchName(arch) << "/$(ProjectName)\"\n"
- << "\t>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCCLCompilerTool\"\n"
- << "\t\tDisableLanguageExtensions=\"" << (setup.devTools ? "false" : "true") << "\"\n"
- << "\t\tDisableSpecificWarnings=\"" << warnings << "\"\n"
- << "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << ";" << prefix << "\\engines;" << includeDirsList << "$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "\"\n"
- << "\t\tPreprocessorDefinitions=\"" << definesList << "\"\n"
- << "\t\tExceptionHandling=\"" << ((setup.devTools || setup.tests || _version == 14) ? "1" : "0") << "\"\n";
-
-#if NEEDS_RTTI
- properties << "\t\tRuntimeTypeInfo=\"true\"\n";
-#else
- properties << "\t\tRuntimeTypeInfo=\"false\"\n";
-#endif
-
- properties << "\t\tWarningLevel=\"4\"\n"
- << "\t\tWarnAsError=\"false\"\n"
- << "\t\tCompileAs=\"0\"\n"
- << "\t\tObjectFile=\"$(IntDir)dists\\msvc\\%(RelativeDir)\"\n"
- << "\t\t/>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCLibrarianTool\"\n"
- << "\t\tIgnoreDefaultLibraryNames=\"\"\n"
- << "\t/>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCLinkerTool\"\n"
- << "\t\tIgnoreDefaultLibraryNames=\"\"\n";
- if (setup.featureEnabled("text-console") || setup.devTools || setup.tests) {
- properties << "\t\tSubSystem=\"1\"\n";
- } else {
- properties << "\t\tSubSystem=\"2\"\n";
- }
-
- if (!setup.devTools && !setup.tests)
- properties << "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n";
-
- std::string libraryDirsList;
- for (StringList::const_iterator i = setup.libraryDirs.begin(); i != setup.libraryDirs.end(); ++i)
- libraryDirsList += convertPathToWin(*i) + ';';
-
- properties << "\t\tAdditionalLibraryDirectories=\"" << libraryDirsList << "$(" << LIBS_DEFINE << ")\\lib\\" << getMSVCArchName(arch) << "\"\n"
- << "\t/>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCResourceCompilerTool\"\n"
- << "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << "\"\n"
- << "\t\tPreprocessorDefinitions=\"" << definesList << "\"\n"
- << "\t/>\n"
- << "</VisualStudioPropertySheet>\n";
-
- properties.flush();
-}
-
-void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration) {
-
- std::ofstream properties((setup.outputDir + '/' + setup.projectDescription + "_" + configuration + getMSVCArchName(arch) + getPropertiesExtension()).c_str());
- if (!properties || !properties.is_open()) {
- error("Could not open \"" + setup.outputDir + '/' + setup.projectDescription + "_" + configuration + getMSVCArchName(arch) + getPropertiesExtension() + "\" for writing");
- return;
- }
-
- properties << "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n"
- << "<VisualStudioPropertySheet\n"
- << "\tProjectType=\"Visual C++\"\n"
- << "\tVersion=\"8.00\"\n"
- << "\tName=\"" << setup.projectDescription << "_" << configuration << getMSVCArchName(arch) << "\"\n"
- << "\tInheritedPropertySheets=\".\\" << setup.projectDescription << "_Global" << getMSVCArchName(arch) << ".vsprops\"\n"
- << "\t>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCCLCompilerTool\"\n";
-
- if (isRelease) {
- properties << "\t\tEnableIntrinsicFunctions=\"true\"\n"
- << "\t\tWholeProgramOptimization=\"true\"\n"
- << "\t\tPreprocessorDefinitions=\"WIN32;RELEASE_BUILD\"\n"
- << "\t\tStringPooling=\"true\"\n"
- << "\t\tBufferSecurityCheck=\"false\"\n"
- << "\t\tDebugInformationFormat=\"0\"\n"
- << "\t\tRuntimeLibrary=\"0\"\n"
- << "\t\tAdditionalOption=\"" << (configuration == "Analysis" ? "/analyze" : "") << "\"\n"
- << "\t/>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCLinkerTool\"\n"
- << "\t\tLinkIncremental=\"1\"\n"
- << "\t\tGenerateManifest=\"false\"\n"
- << "\t\tIgnoreDefaultLibraryNames=\"\"\n"
- << "\t\tSetChecksum=\"true\"\n";
- } else {
- properties << "\t\tOptimization=\"0\"\n"
- << "\t\tPreprocessorDefinitions=\"WIN32\"\n"
- << "\t\tMinimalRebuild=\"true\"\n"
- << "\t\tBasicRuntimeChecks=\"3\"\n"
- << "\t\tRuntimeLibrary=\"1\"\n"
- << "\t\tEnableFunctionLevelLinking=\"true\"\n"
- << "\t\tWarnAsError=\"false\"\n"
- << "\t\tDebugInformationFormat=\"" << (arch == ARCH_X86 ? "3" : "4") << "\"\n" // For x64 format "4" (Edit and continue) is not supported, thus we default to "3"
- << "\t\tAdditionalOption=\"" << (configuration == "Analysis" ? "/analyze" : "") << "\"\n"
- << "\t/>\n"
- << "\t<Tool\n"
- << "\t\tName=\"VCLinkerTool\"\n"
- << "\t\tLinkIncremental=\"2\"\n"
- << "\t\tGenerateManifest=\"false\"\n"
- << "\t\tGenerateDebugInformation=\"true\"\n"
- << "\t\tIgnoreDefaultLibraryNames=\"libcmt.lib\"\n";
- }
-
- properties << "\t/>\n"
- << "</VisualStudioPropertySheet>\n";
-
- properties.flush();
- properties.close();
-}
-
-void VisualStudioProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix) {
- const std::string indentString = getIndent(indentation + 2);
-
- if (indentation)
- projectFile << getIndent(indentation + 1) << "<Filter\tName=\"" << dir.name << "\">\n";
-
- for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) {
- const FileNode *node = *i;
-
- if (!node->children.empty()) {
- writeFileListToProject(*node, projectFile, indentation + 1, objPrefix + node->name + '_', filePrefix + node->name + '/');
- } else {
- std::string filePath = convertPathToWin(filePrefix + node->name);
- if (producesObjectFile(node->name)) {
- std::string name, ext;
- splitFilename(node->name, name, ext);
-
- if (ext == "asm") {
- std::string objFileName = "$(IntDir)\\";
- objFileName += objPrefix;
- objFileName += "$(InputName).obj";
-
- const std::string toolLine = indentString + "\t\t<Tool Name=\"VCCustomBuildTool\" CommandLine=\"nasm.exe -f win32 -g -o "" + objFileName + "" "$(InputPath)"
\" Outputs=\"" + objFileName + "\" />\n";
-
- // NASM is not supported for x64, thus we do not need to add additional entries here :-).
- writeFileToProject(projectFile, filePath, ARCH_X86, indentString, toolLine);
- } else {
- projectFile << indentString << "<File RelativePath=\"" << filePath << "\" />\n";
- }
- } else {
- projectFile << indentString << "<File RelativePath=\"" << filePath << "\" />\n";
- }
- }
- }
-
- if (indentation)
- projectFile << getIndent(indentation + 1) << "</Filter>\n";
-}
-
-void VisualStudioProvider::writeFileToProject(std::ofstream &projectFile, const std::string &filePath, MSVC_Architecture arch,
- const std::string &indentString, const std::string &toolLine) {
- projectFile << indentString << "<File RelativePath=\"" << filePath << "\">\n"
- << indentString << "\t<FileConfiguration Name=\"Debug|" << getMSVCConfigName(arch) << "\">\n"
- << toolLine
- << indentString << "\t</FileConfiguration>\n"
- << indentString << "\t<FileConfiguration Name=\"Analysis|" << getMSVCConfigName(arch) << "\">\n"
- << toolLine
- << indentString << "\t</FileConfiguration>\n"
- << indentString << "\t<FileConfiguration Name=\"LLVM|" << getMSVCConfigName(arch) << "\">\n"
- << toolLine
- << indentString << "\t</FileConfiguration>\n"
- << indentString << "\t<FileConfiguration Name=\"Release|" << getMSVCConfigName(arch) << "\">\n"
- << toolLine
- << indentString << "\t</FileConfiguration>\n"
- << indentString << "</File>\n";
-}
-
-} // namespace CreateProjectTool
diff --git a/devtools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h
deleted file mode 100644
index dfb5d0fdb4..0000000000
--- a/devtools/create_project/visualstudio.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef TOOLS_CREATE_PROJECT_VISUALSTUDIO_H
-#define TOOLS_CREATE_PROJECT_VISUALSTUDIO_H
-
-#include "msvc.h"
-
-namespace CreateProjectTool {
-
-class VisualStudioProvider : public MSVCProvider {
-public:
- VisualStudioProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, const int version, const MSVCVersion &msvc);
-
-protected:
- void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
- const StringList &includeList, const StringList &excludeList);
-
- void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
- const std::string &objPrefix, const std::string &filePrefix);
-
- void writeFileToProject(std::ofstream &projectFile, const std::string &filePath, MSVC_Architecture arch,
- const std::string &indentString, const std::string &toolLine);
-
- void writeReferences(const BuildSetup &setup, std::ofstream &output);
-
- void outputGlobalPropFile(const BuildSetup &setup, std::ofstream &properties, MSVC_Architecture arch, const StringList &defines, const std::string &prefix, bool runBuildEvents);
-
- void createBuildProp(const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration);
-
- const char *getProjectExtension();
- const char *getPropertiesExtension();
-
- void outputConfiguration(std::ostream &project, const BuildSetup &setup, bool isRelease, const std::string &config, const MSVC_Architecture arch);
- void outputConfiguration(const BuildSetup &setup, std::ostream &project, const std::string &toolConfig, const std::string &config, const MSVC_Architecture arch);
- void outputBuildEvents(std::ostream &project, const BuildSetup &setup, const MSVC_Architecture arch);
-};
-
-} // namespace CreateProjectTool
-
-#endif // TOOLS_CREATE_PROJECT_VISUALSTUDIO_H
diff --git a/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj b/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj
index 9a75f2f7c0..76e31621fd 100644
--- a/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj
+++ b/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
F9A66C6A1396D4DF00CEE494 /* create_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9A66C621396D4DF00CEE494 /* create_project.cpp */; };
F9A66C6B1396D4DF00CEE494 /* msbuild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9A66C651396D4DF00CEE494 /* msbuild.cpp */; };
F9A66C6C1396D4DF00CEE494 /* msvc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9A66C671396D4DF00CEE494 /* msvc.cpp */; };
- F9A66C6F1396D4E800CEE494 /* visualstudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9A66C6D1396D4E800CEE494 /* visualstudio.cpp */; };
F9A66C871396E2F500CEE494 /* xcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9A66C861396E2F500CEE494 /* xcode.cpp */; };
F9A66C91139704A400CEE494 /* create_project in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9A66C271396D36100CEE494 /* create_project */; };
F9BA99141398064E00C276C2 /* create_project in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9A66C271396D36100CEE494 /* create_project */; };
@@ -59,8 +58,6 @@
F9A66C661396D4DF00CEE494 /* msbuild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msbuild.h; path = ../msbuild.h; sourceTree = "<group>"; };
F9A66C671396D4DF00CEE494 /* msvc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = msvc.cpp; path = ../msvc.cpp; sourceTree = "<group>"; };
F9A66C681396D4DF00CEE494 /* msvc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msvc.h; path = ../msvc.h; sourceTree = "<group>"; };
- F9A66C6D1396D4E800CEE494 /* visualstudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = visualstudio.cpp; path = ../visualstudio.cpp; sourceTree = "<group>"; };
- F9A66C6E1396D4E800CEE494 /* visualstudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = visualstudio.h; path = ../visualstudio.h; sourceTree = "<group>"; };
F9A66C841396E2D800CEE494 /* xcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcode.h; path = ../xcode.h; sourceTree = "<group>"; };
F9A66C861396E2F500CEE494 /* xcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xcode.cpp; path = ../xcode.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -83,8 +80,6 @@
0765835F1D660492006CBB9B /* cmake.h */,
F9A66C861396E2F500CEE494 /* xcode.cpp */,
F9A66C841396E2D800CEE494 /* xcode.h */,
- F9A66C6D1396D4E800CEE494 /* visualstudio.cpp */,
- F9A66C6E1396D4E800CEE494 /* visualstudio.h */,
F9A66C5F1396D4DF00CEE494 /* codeblocks.cpp */,
F9A66C601396D4DF00CEE494 /* codeblocks.h */,
F9A66C611396D4DF00CEE494 /* config.h */,
@@ -175,7 +170,6 @@
F9A66C6B1396D4DF00CEE494 /* msbuild.cpp in Sources */,
F9A66C6C1396D4DF00CEE494 /* msvc.cpp in Sources */,
076583601D660492006CBB9B /* cmake.cpp in Sources */,
- F9A66C6F1396D4E800CEE494 /* visualstudio.cpp in Sources */,
F9A66C871396E2F500CEE494 /* xcode.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
More information about the Scummvm-git-logs
mailing list