mirror of
https://github.com/scummvm/scummvm.git
synced 2026-05-21 05:40:43 +00:00
CREATE_PROJECT: Remove useless attribute from ProjectProvider
Move it to MSVC where it's really needed.
This commit is contained in:
committed by
Lars Sundström
parent
311e01d687
commit
96be501f58
@@ -29,8 +29,8 @@
|
||||
|
||||
namespace CreateProjectTool {
|
||||
|
||||
CMakeProvider::CMakeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors, version) {
|
||||
CMakeProvider::CMakeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors) {
|
||||
}
|
||||
|
||||
const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *feature, SDLVersion useSDL) const {
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace CreateProjectTool {
|
||||
*/
|
||||
class CMakeProvider final : public ProjectProvider {
|
||||
public:
|
||||
CMakeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version = 0);
|
||||
CMakeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
|
||||
namespace CreateProjectTool {
|
||||
|
||||
CodeBlocksProvider::CodeBlocksProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors, version) {
|
||||
CodeBlocksProvider::CodeBlocksProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors) {
|
||||
}
|
||||
|
||||
void CodeBlocksProvider::createWorkspace(const BuildSetup &setup) {
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace CreateProjectTool {
|
||||
|
||||
class CodeBlocksProvider final : public ProjectProvider {
|
||||
public:
|
||||
CodeBlocksProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version = 0);
|
||||
CodeBlocksProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -1873,8 +1873,8 @@ FileNode *scanFiles(const std::string &dir, const StringList &includeList, const
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Project Provider methods
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
ProjectProvider::ProjectProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version)
|
||||
: _version(version), _globalWarnings(global_warnings), _projectWarnings(project_warnings), _globalErrors(global_errors) {
|
||||
ProjectProvider::ProjectProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors)
|
||||
: _globalWarnings(global_warnings), _projectWarnings(project_warnings), _globalErrors(global_errors) {
|
||||
}
|
||||
|
||||
void ProjectProvider::createProject(BuildSetup &setup) {
|
||||
|
||||
@@ -566,7 +566,7 @@ public:
|
||||
* @param project_warnings List of project-specific warnings
|
||||
* @param version Target project version.
|
||||
*/
|
||||
ProjectProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version = 0);
|
||||
ProjectProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors);
|
||||
virtual ~ProjectProvider() {}
|
||||
|
||||
/**
|
||||
@@ -585,7 +585,6 @@ public:
|
||||
static std::string getLastPathComponent(const std::string &path);
|
||||
|
||||
protected:
|
||||
const int _version; ///< Target project version
|
||||
StringList &_globalWarnings; ///< Global (ignored) warnings
|
||||
StringList &_globalErrors; ///< Global errors (promoted from warnings)
|
||||
std::map<std::string, StringList> &_projectWarnings; ///< Per-project warnings
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace CreateProjectTool {
|
||||
// MSVC Provider (Base class)
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version, const MSVCVersion &msvc)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors, version), _msvcVersion(msvc) {
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors), _version(version), _msvcVersion(msvc) {
|
||||
|
||||
_enableLanguageExtensions = tokenize(ENABLE_LANGUAGE_EXTENSIONS, ',');
|
||||
_disableEditAndContinue = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
|
||||
|
||||
@@ -31,6 +31,7 @@ public:
|
||||
MSVCProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version, const MSVCVersion &msvcVersion);
|
||||
|
||||
protected:
|
||||
const int _version;
|
||||
const MSVCVersion _msvcVersion;
|
||||
|
||||
StringList _enableLanguageExtensions;
|
||||
|
||||
@@ -297,8 +297,8 @@ void XcodeProvider::addBuildFile(const std::string &id, const std::string &name,
|
||||
_buildFile._flags = kSettingsSingleItem;
|
||||
}
|
||||
|
||||
XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors, version) {
|
||||
XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors)
|
||||
: ProjectProvider(global_warnings, project_warnings, global_errors) {
|
||||
_rootSourceGroup = nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace CreateProjectTool {
|
||||
|
||||
class XcodeProvider final : public ProjectProvider {
|
||||
public:
|
||||
XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors, const int version = 0);
|
||||
XcodeProvider(StringList &global_warnings, std::map<std::string, StringList> &project_warnings, StringList &global_errors);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user