thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CREATE_PROJECT: Remove C++11

Browse source
This commit is contained in:
Michał Janiszewski 2020-07-13 12:43:51 +02:00 • committed by Eugene Sandulenko
parent 26591c1341
commit 680da50b81
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
devtools/create_project/create_project.cpp
View file

@ -1201,8 +1201,12 @@ StringList getFeatureLibraries(const FeatureList &features) {
StringList libraries; StringList libraries;
for (FeatureList::const_iterator i = features.begin(); i != features.end(); ++i) { for (FeatureList::const_iterator i = features.begin(); i != features.end(); ++i) {
libraries.merge(getFeatureLibraries(*i)); StringList fl = getFeatureLibraries(*i);
for (StringList::const_iterator flit = fl.begin(); flit != fl.end(); ++flit) {
libraries.push_back(*flit);
}
} }
libraries.sort();
return libraries; return libraries;
} }
@ -1227,7 +1231,8 @@ bool getFeatureBuildState(const std::string &name, FeatureList &features) {
} }
BuildSetup removeFeatureFromSetup(BuildSetup setup, const std::string &feature) { BuildSetup removeFeatureFromSetup(BuildSetup setup, const std::string &feature) {
for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) { // TODO: use const_iterator in C++11
for (FeatureList::iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
if (i->enable && feature == i->name) { if (i->enable && feature == i->name) {
StringList feature_libs = getFeatureLibraries(*i); StringList feature_libs = getFeatureLibraries(*i);
for (StringList::iterator lib = feature_libs.begin(); lib != feature_libs.end(); ++lib) { for (StringList::iterator lib = feature_libs.begin(); lib != feature_libs.end(); ++lib) {

11
devtools/create_project/msvc.cpp
View file

@ -40,11 +40,18 @@ MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, St
_disableEditAndContinue = tokenize(DISABLE_EDIT_AND_CONTINUE, ','); _disableEditAndContinue = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
// NASM not supported for Windows on AMD64 target // NASM not supported for Windows on AMD64 target
_arch_disabled_features[ARCH_AMD64] = {"nasm"}; StringList amd64_disabled_features;
amd64_disabled_features.push_back("nasm");
_arch_disabled_features[ARCH_AMD64] = amd64_disabled_features;
// NASM not supported for WoA target // NASM not supported for WoA target
// No OpenGL, OpenGL ES on Windows on ARM // No OpenGL, OpenGL ES on Windows on ARM
// https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64 // https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
_arch_disabled_features[ARCH_ARM64] = {"nasm", "opengl", "opengles", "fribidi"}; StringList arm64_disabled_features;
arm64_disabled_features.push_back("nasm");
arm64_disabled_features.push_back("opengl");
arm64_disabled_features.push_back("opengles");
arm64_disabled_features.push_back("fribidi");
_arch_disabled_features[ARCH_ARM64] = arm64_disabled_features;
} }
void MSVCProvider::createWorkspace(const BuildSetup &setup) { void MSVCProvider::createWorkspace(const BuildSetup &setup) {