Resolve #5203: Let the game setup dialog look for x64 as well as x86 …

…engine executables. The string in the darkmod.game file is interpreted as regex to achieve this.

install/games/darkmod.game

@@ -6,9 +6,9 @@
   enginepath_win32="C:/games/darkmod/"
   enginepath_linux="/usr/local/games/darkmod/"
   enginepath_macos="/usr/local/games/darkmod/"
-  engine_win32="TheDarkMod.exe"
-  engine_linux="thedarkmod.x86"
-  engine_macos="thedarkmod.app"
+  engine_win32="^TheDarkMod(x64|){1}\.exe$"
+  engine_linux="^thedarkmod.(x64|x86){1}$"
+  engine_macos="^thedarkmod.app$"
   prefix=""
   basegame=""
   archivetypes="pk4"

radiant/ui/prefdialog/GameSetupPageTdm.cpp

@@ -1,6 +1,7 @@
 #include "GameSetupPageTdm.h"
 
 #include <set>
+#include <regex>
 #include "i18n.h"
 #include "imodule.h"
 #include "igame.h"
@@ -213,12 +214,18 @@ void GameSetupPageTdm::validateSettings()
 #endif
 		;
 
-	std::string exeName = _game->getKeyValue(ENGINE_EXECUTABLE_ATTRIBUTE);
+	bool found = false;
+	std::regex exeRegex(_game->getKeyValue(ENGINE_EXECUTABLE_ATTRIBUTE));
 
-	if (!os::fileOrDirExists(darkmodExePath / exeName))
+	os::foreachItemInDirectory(_config.enginePath, [&](const fs::path& path)
+	{
+		found |= std::regex_match(path.filename().string(), exeRegex);
+	});
+
+	if (!found)
 	{
 		// engine executable not present
-		errorMsg += fmt::format(_("The engine executable \"{0}\" could not be found in the specified folder.\n"), exeName);
+		errorMsg += _("The engine executable(s) could not be found in the specified folder.\n");
 	}
 
 	// Check the mod path (=mission path), if not empty