[Scummvm-git-logs] scummvm master -> 4f29b747fd54d0ad7bb399950451b8d04f2542a3

[sluicebox]

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:
4f29b747fd CREATE_PROJECT: Fix compilation on older MSVC


Commit: 4f29b747fd54d0ad7bb399950451b8d04f2542a3
    https://github.com/scummvm/scummvm/commit/4f29b747fd54d0ad7bb399950451b8d04f2542a3
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-11-10T21:05:51-08:00

Commit Message:
CREATE_PROJECT: Fix compilation on older MSVC

Changed paths:
    devtools/create_project/cmake.cpp
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 1ff789bb92..2f5af0c5d7 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -53,10 +53,10 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 		{ "faad",       "faad2",             kSDLVersionAny, 0,              0,          0,                       0,                     "faad"       },
 		{ "fribidi",    "fribidi",           kSDLVersionAny, 0,              0,          0,                       0,                     "fribidi"    },
 		{ "discord",    "discord",           kSDLVersionAny, 0,              0,          0,                       0,                     "discord-rpc"},
-		{ "opengl",     nullptr,             kSDLVersionAny, "FindOpenGL",   "OpenGL",   "OPENGL_INCLUDE_DIR",    "OPENGL_gl_LIBRARY",   0            },
+		{ "opengl",     0,                   kSDLVersionAny, "FindOpenGL",   "OpenGL",   "OPENGL_INCLUDE_DIR",    "OPENGL_gl_LIBRARY",   0            },
 		{ "glew",       "glew",              kSDLVersionAny, "FindGLEW",     "GLEW",     "GLEW_INCLUDE_DIR",      "GLEW_LIBRARIES",      0            },
 		{ "libcurl",    "libcurl",           kSDLVersionAny, "FindCURL",     "CURL",     "CURL_INCLUDE_DIRS",     "CURL_LIBRARIES",      0            },
-		{ "sdlnet",     nullptr,             kSDLVersion1,   "FindSDL_net",  "SDL_net",  "SDL_NET_INCLUDE_DIRS",  "SDL_NET_LIBRARIES",   0            },
+		{ "sdlnet",     0,                   kSDLVersion1,   "FindSDL_net",  "SDL_net",  "SDL_NET_INCLUDE_DIRS",  "SDL_NET_LIBRARIES",   0            },
 		{ "sdlnet",     "SDL2_net",          kSDLVersion2,   0,              0,          0,                       0,                     "SDL2_net"   }
 	};
 
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7bd0ea9487..0202034613 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1551,8 +1551,8 @@ void ProjectProvider::createProject(BuildSetup &setup) {
 			detectionModuleDirs.push_back(setup.srcDir + "/engines/" + i->name);
 		}
 
-		for (std::string &str : detectionModuleDirs) {
-			createModuleList(str, setup.defines, setup.testDirs, in, ex, true);
+        for (std::vector<std::string>::const_iterator i = detectionModuleDirs.begin(), end = detectionModuleDirs.end(); i != end; ++i) {
+			createModuleList(*i, setup.defines, setup.testDirs, in, ex, true);
 		}
 
 		createProjectFile(detProject, detUUID, setup, setup.srcDir, in, ex);
@@ -1992,8 +1992,8 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
 		std::string engineName = moduleRootDir.substr(p + 1);
 		std::string engineNameUpper;
 
-		for (char &c : engineName) {
-			engineNameUpper += toupper(c);
+        for (std::string::const_iterator i = engineName.begin(); i != engineName.end(); ++i) {
+			engineNameUpper += toupper(*i);
 		}
 		for (;;) {
 			std::getline(moduleMk, line);