[Scummvm-cvs-logs] SF.net SVN: scummvm: [22347] scummvm/trunk/base
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu May 4 16:31:02 CEST 2006
Revision: 22347
Author: fingolfin
Date: 2006-05-04 16:29:56 -0700 (Thu, 04 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22347&view=rev
Log Message:
-----------
Renamed base/gameDetector.h/.cpp to base/options.h/.cpp
Modified Paths:
--------------
scummvm/trunk/base/main.cpp
scummvm/trunk/base/module.mk
scummvm/trunk/dists/devcpp/scummvm.dev
scummvm/trunk/dists/msevc4/gob/gob.vcp
scummvm/trunk/dists/msevc4/queen/queen.vcp
scummvm/trunk/dists/msevc4/saga/saga.vcp
scummvm/trunk/dists/msevc4/scumm/scumm.vcp
scummvm/trunk/dists/msevc4/scummvm/scummvm.vcp
scummvm/trunk/dists/msevc4/simon/simon.vcp
scummvm/trunk/dists/msevc4/sky/sky.vcp
scummvm/trunk/dists/msevc4/sword1/sword1.vcp
scummvm/trunk/dists/msevc4/sword2/sword2.vcp
scummvm/trunk/dists/msvc6/scummvm.dsp
scummvm/trunk/dists/msvc7/scummvm.vcproj
scummvm/trunk/dists/msvc71/scummvm.vcproj
scummvm/trunk/dists/msvc8/scummvm.vcproj
Added Paths:
-----------
scummvm/trunk/base/options.cpp
scummvm/trunk/base/options.h
Removed Paths:
-------------
scummvm/trunk/base/gameDetector.cpp
scummvm/trunk/base/gameDetector.h
Deleted: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/base/gameDetector.cpp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -1,564 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001 Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * 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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/stdafx.h"
-
-#include "base/engine.h"
-#include "base/gameDetector.h"
-#include "base/plugins.h"
-#include "base/version.h"
-
-#include "common/config-manager.h"
-#include "common/system.h"
-
-#include "sound/mididrv.h"
-#include "sound/mixer.h"
-
-#ifdef UNIX
-#include <errno.h>
-#include <sys/stat.h>
-#ifdef MACOSX
-#define DEFAULT_SAVE_PATH "Documents/ScummVM Savegames"
-#else
-#define DEFAULT_SAVE_PATH ".scummvm"
-#endif
-#elif defined(__SYMBIAN32__)
-#include <errno.h>
-#include <sys/stat.h>
-#define DEFAULT_SAVE_PATH "Savegames"
-#endif
-
-static const char USAGE_STRING[] =
- "%s: %s\n"
- "Usage: %s [OPTIONS]... [GAME]\n"
- "\n"
- "Try '%s --help' for more options.\n"
-;
-
-// DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
-#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__)
-static const char HELP_STRING[] = "NoUsageString"; // save more data segment space
-#else
-static const char HELP_STRING[] =
- "ScummVM - Graphical Adventure Game Interpreter\n"
- "Usage: %s [OPTIONS]... [GAME]\n"
- " -v, --version Display ScummVM version information and exit\n"
- " -h, --help Display a brief help text and exit\n"
- " -z, --list-games Display list of supported games and exit\n"
- " -t, --list-targets Display list of configured targets and exit\n"
- "\n"
- " -c, --config=CONFIG Use alternate configuration file\n"
- " -p, --path=PATH Path to where the game is installed\n"
- " -x, --save-slot[=NUM] Save game slot to load (default: autosave)\n"
- " -f, --fullscreen Force full-screen mode\n"
- " -F, --no-fullscreen Force windowed mode\n"
- " -g, --gfx-mode=MODE Select graphics scaler (normal,2x,3x,2xsai,\n"
- " super2xsai,supereagle,advmame2x,advmame3x,hq2x,\n"
- " hq3x,tv2x,dotmatrix)\n"
- " -e, --music-driver=MODE Select music driver (see README for details)\n"
- " -q, --language=LANG Select language (en,de,fr,it,pt,es,jp,zh,kr,se,gb,\n"
- " hb,ru,cz)\n"
- " -m, --music-volume=NUM Set the music volume, 0-255 (default: 192)\n"
- " -s, --sfx-volume=NUM Set the sfx volume, 0-255 (default: 192)\n"
- " -r, --speech-volume=NUM Set the speech volume, 0-255 (default: 192)\n"
- " --midi-gain=NUM Set the gain for MIDI playback, 0-1000 (default:\n"
- " 100) (only supported by some MIDI drivers)\n"
- " -n, --subtitles Enable subtitles (use with games that have voice)\n"
- " -b, --boot-param=NUM Pass number to the boot script (boot param)\n"
- " -d, --debuglevel=NUM Set debug verbosity level\n"
- " --debugflags=FLAGS Enables engine specific debug flags\n"
- " (separated by commas)\n"
- " -u, --dump-scripts Enable script dumping if a directory called 'dumps'\n"
- " exists in the current directory\n"
- "\n"
- " --cdrom=NUM CD drive to play CD audio from (default: 0 = first\n"
- " drive)\n"
- " --joystick[=NUM] Enable input with joystick (default: 0 = first\n"
- " joystick)\n"
- " --platform=WORD Specify platform of game (allowed values: 3do, acorn,\n"
- " amiga, atari, c64, fmtowns, nes, mac, pc, segacd,\n"
- " windows)\n"
- " --savepath=PATH Path to where savegames are stored\n"
- " --soundfont=FILE Select the SoundFont for MIDI playback (only\n"
- " supported by some MIDI drivers)\n"
- " --multi-midi Enable combination Adlib and native MIDI\n"
- " --native-mt32 True Roland MT-32 (disable GM emulation)\n"
- " --enable-gs Enable Roland GS mode for MIDI playback\n"
- " --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
- " --aspect-ratio Enable aspect ratio correction\n"
- " --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,\n"
- " hercAmber, amiga)\n"
- " --force-1x-overlay Make inner GUI 320x200\n"
- "\n"
-#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
- " --alt-intro Use alternative intro for CD versions of Beneath a\n"
- " Steel Sky and Flight of the Amazon Queen\n"
-#endif
- " --copy-protection Enable copy protection in SCUMM games, when\n"
- " ScummVM disables it by default.\n"
- " --talkspeed=NUM Set talk speed for games (default: 60)\n"
-#ifndef DISABLE_SCUMM
- " --demo-mode Start demo mode of Maniac Mansion\n"
- " --tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games\n"
- " (default: 100)\n"
-#endif
- "\n"
- "The meaning of boolean long options can be inverted by prefixing them with\n"
- "\"no-\", e.g. \"--no-aspect-ratio\".\n"
-;
-#endif
-
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
-static Common::String s_appName("scummvm");
-#else
-static const char *s_appName = "scummvm";
-#endif
-
-static void usage(const char *s, ...) GCC_PRINTF(1, 2);
-
-static void usage(const char *s, ...) {
- char buf[STRINGBUFLEN];
- va_list va;
-
- va_start(va, s);
- vsnprintf(buf, STRINGBUFLEN, s, va);
- va_end(va);
-
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
- printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str());
-#endif
- exit(1);
-}
-
-void GameDetector::registerDefaults() {
-
- // Graphics
- ConfMan.registerDefault("fullscreen", false);
- ConfMan.registerDefault("aspect_ratio", false);
- ConfMan.registerDefault("gfx_mode", "normal");
- ConfMan.registerDefault("render_mode", "default");
-#if defined(__SYMBIAN32__)
- ConfMan.registerDefault("force_1x_overlay", true);
-#else
- ConfMan.registerDefault("force_1x_overlay", false);
-#endif
-
-
- // Sound & Music
- ConfMan.registerDefault("music_volume", 192);
- ConfMan.registerDefault("sfx_volume", 192);
- ConfMan.registerDefault("speech_volume", 192);
-
- ConfMan.registerDefault("music_mute", false);
- ConfMan.registerDefault("sfx_mute", false);
- ConfMan.registerDefault("speech_mute", false);
-
- ConfMan.registerDefault("multi_midi", false);
- ConfMan.registerDefault("native_mt32", false);
- ConfMan.registerDefault("enable_gs", false);
- ConfMan.registerDefault("midi_gain", 100);
-// ConfMan.registerDefault("music_driver", ???);
-
- ConfMan.registerDefault("cdrom", 0);
-
- // Game specific
- ConfMan.registerDefault("path", "");
- ConfMan.registerDefault("savepath", "");
-
-// ConfMan.registerDefault("amiga", false);
- ConfMan.registerDefault("platform", Common::kPlatformPC);
- ConfMan.registerDefault("language", "en");
- ConfMan.registerDefault("subtitles", false);
- ConfMan.registerDefault("boot_param", 0);
- ConfMan.registerDefault("dump_scripts", false);
- ConfMan.registerDefault("save_slot", -1);
- ConfMan.registerDefault("autosave_period", 5 * 60); // By default, trigger autosave every 5 minutes
-
-#if !defined(DISABLE_SCUMM) || !defined(DISABLE_SWORD2)
- ConfMan.registerDefault("object_labels", true);
-#endif
-
- ConfMan.registerDefault("copy_protection", false);
- ConfMan.registerDefault("talkspeed", 60);
-
-#ifndef DISABLE_SCUMM
- ConfMan.registerDefault("demo_mode", false);
- ConfMan.registerDefault("tempo", 0);
-#endif
-
-#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
- ConfMan.registerDefault("alt_intro", false);
-#endif
-
- // Miscellaneous
- ConfMan.registerDefault("joystick_num", -1);
- ConfMan.registerDefault("confirm_exit", false);
- ConfMan.registerDefault("disable_sdl_parachute", false);
-#ifdef USE_ALSA
- ConfMan.registerDefault("alsa_port", "65:0");
-#endif
-
-#ifdef DEFAULT_SAVE_PATH
- char savePath[MAXPATHLEN];
-#ifdef UNIX
- struct stat sb;
- const char *home = getenv("HOME");
- if (home && *home && strlen(home) < MAXPATHLEN) {
- snprintf(savePath, MAXPATHLEN, "%s/%s", home, DEFAULT_SAVE_PATH);
- if (stat(savePath, &sb) == -1) {
- /* create the dir if it does not exist */
- if (errno == ENOENT) {
- if (mkdir(savePath, 0755) != 0) {
- perror("mkdir");
- exit(1);
- }
- }
- }
- /* check that the dir is there */
- if (stat(savePath, &sb) == 0) {
- ConfMan.registerDefault("savepath", savePath);
- }
- }
-#elif defined(__SYMBIAN32__)
- strcpy(savePath, Symbian::GetExecutablePath());
- strcat(savePath, DEFAULT_SAVE_PATH);
- struct stat sb;
- if (stat(savePath, &sb) == -1)
- if (errno == ENOENT)// create the dir if it does not exist
- if (mkdir(savePath, 0755) != 0)
- error("mkdir for '%s' failed!", savePath);
- ConfMan.registerDefault("savepath", savePath); // this should be enough...
-#endif
-#endif // #ifdef DEFAULT_SAVE_PATH
-}
-
-//
-// Various macros used by the command line parser.
-//
-
-// Use this for options which have an *optional* value
-#define DO_OPTION_OPT(shortCmd, longCmd, defaultVal) \
- if (isLongCmd ? (!memcmp(s+2, longCmd"=", sizeof(longCmd"=") - 1)) : (tolower(s[1]) == shortCmd)) { \
- s += 2; \
- if (isLongCmd) \
- s += sizeof(longCmd"=") - 1; \
- const char *option = s; \
- if (*s == '\0') { option = s2; i++; } \
- if (!option) option = defaultVal; \
- if (option) settings[longCmd] = option;
-
-// Use this for options which have a required (string) value
-#define DO_OPTION(shortCmd, longCmd) \
- DO_OPTION_OPT(shortCmd, longCmd, 0) \
- if (!option) usage("Option '%s' requires an argument", argv[i]);
-
-// Use this for options which have a required integer value
-#define DO_OPTION_INT(shortCmd, longCmd) \
- DO_OPTION_OPT(shortCmd, longCmd, 0) \
- if (!option) usage("Option '%s' requires an argument", argv[i]); \
- char *endptr = 0; \
- int intValue; intValue = (int)strtol(option, &endptr, 0); \
- if (endptr == NULL || *endptr != 0) usage("--%s: Invalid number '%s'", longCmd, option);
-
-// Use this for boolean options; this distinguishes between "-x" and "-X",
-// resp. between "--some-option" and "--no-some-option".
-#define DO_OPTION_BOOL(shortCmd, longCmd) \
- if (isLongCmd ? (!strcmp(s+2, longCmd) || !strcmp(s+2, "no-"longCmd)) : (tolower(s[1]) == shortCmd)) { \
- bool boolValue = islower(s[1]); \
- s += 2; \
- if (isLongCmd) { \
- boolValue = !strcmp(s, longCmd); \
- s += boolValue ? (sizeof(longCmd) - 1) : (sizeof("no-"longCmd) - 1); \
- } \
- if (*s != '\0') goto unknownOption; \
- const char *option = boolValue ? "true" : "false"; \
- settings[longCmd] = option;
-
-// Use this for options which never have a value, i.e. for 'commands', like "--help".
-#define DO_OPTION_CMD(shortCmd, longCmd) \
- if (isLongCmd ? (!strcmp(s+2, longCmd)) : (tolower(s[1]) == shortCmd)) { \
- s += 2; \
- if (isLongCmd) \
- s += sizeof(longCmd) - 1; \
- if (*s != '\0') goto unknownOption;
-
-
-#define DO_LONG_OPTION_OPT(longCmd, d) DO_OPTION_OPT(0, longCmd, d)
-#define DO_LONG_OPTION(longCmd) DO_OPTION(0, longCmd)
-#define DO_LONG_OPTION_INT(longCmd) DO_OPTION_INT(0, longCmd)
-#define DO_LONG_OPTION_BOOL(longCmd) DO_OPTION_BOOL(0, longCmd)
-#define DO_LONG_OPTION_CMD(longCmd) DO_OPTION_CMD(0, longCmd)
-
-// End an option handler
-#define END_OPTION \
- continue; \
- }
-
-
-Common::String GameDetector::parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
- const char *s, *s2;
-
- // argv[0] contains the name of the executable.
- if (argv && argv[0]) {
- s = strchr(argv[0], '/');
- s_appName = s ? s : argv[0];
- }
-
- // We store all command line settings into a string map.
-
- // Iterate over all command line arguments and parse them into our string map.
- for (int i = 1; i < argc; ++i) {
- s = argv[i];
- s2 = (i < argc-1) ? argv[i+1] : 0;
-
- if (s[0] != '-') {
- // The argument doesn't start with a dash, so it's not an option.
- // Hence it must be the target name. We currently enforce that
- // this always comes last.
- if (i != argc - 1)
- usage("Stray argument '%s'", s);
-
- // We defer checking whether this is a valid target to a later point.
- return s;
- } else {
-
- bool isLongCmd = (s[0] == '-' && s[1] == '-');
-
- DO_OPTION_CMD('h', "help")
- printf(HELP_STRING, argv[0]);
- exit(0);
- END_OPTION
-
- DO_OPTION_CMD('v', "version")
- printf("%s\n", gScummVMFullVersion);
- printf("Features compiled in: %s\n", gScummVMFeatures);
- exit(0);
- END_OPTION
-
- DO_OPTION_CMD('t', "list-targets")
- return "list-targets";
- END_OPTION
-
- DO_OPTION_CMD('z', "list-games")
- return "list-games";
- END_OPTION
-
-
- // HACK FIXME TODO: This switch is intentionally *not* documented!
- DO_LONG_OPTION_CMD("test-detector")
- return "test-detector";
- END_OPTION
-
-
- DO_OPTION('c', "config")
- END_OPTION
-
- DO_OPTION_INT('b', "boot-param")
- END_OPTION
-
- DO_OPTION_OPT('d', "debuglevel", "0")
- END_OPTION
-
- DO_LONG_OPTION("debugflags")
- END_OPTION
-
- DO_OPTION('e', "music-driver")
- if (MidiDriver::parseMusicDriver(option) < 0)
- usage("Unrecognized music driver '%s'", option);
- END_OPTION
-
- DO_LONG_OPTION_INT("output-rate")
- END_OPTION
-
- DO_OPTION_BOOL('f', "fullscreen")
- END_OPTION
-
- DO_OPTION('g', "gfx-mode")
- // Check whether 'option' specifies a valid graphics mode.
- bool isValid = false;
- if (!scumm_stricmp(option, "normal") || !scumm_stricmp(option, "default"))
- isValid = true;
- if (!isValid) {
- const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
- while (gm->name && !isValid) {
- isValid = !scumm_stricmp(gm->name, option);
- gm++;
- }
- }
- if (!isValid)
- usage("Unrecognized graphics mode '%s'", option);
- END_OPTION
-
- DO_OPTION_INT('m', "music-volume")
- END_OPTION
-
- DO_OPTION_BOOL('n', "subtitles")
- END_OPTION
-
- DO_OPTION('p', "path")
- // TODO: Verify whether the path is valid
- END_OPTION
-
- DO_OPTION('q', "language")
- if (Common::parseLanguage(option) == Common::UNK_LANG)
- usage("Unrecognized language '%s'", option);
- END_OPTION
-
- DO_OPTION_INT('s', "sfx-volume")
- END_OPTION
-
- DO_OPTION_INT('r', "speech-volume")
- END_OPTION
-
- DO_LONG_OPTION_INT("midi-gain")
- END_OPTION
-
- DO_OPTION_BOOL('u', "dump-scripts")
- END_OPTION
-
- DO_OPTION_OPT('x', "save-slot", "0")
- END_OPTION
-
- DO_LONG_OPTION_INT("cdrom")
- END_OPTION
-
- DO_LONG_OPTION_OPT("joystick", "0")
- END_OPTION
-
- DO_LONG_OPTION("platform")
- int platform = Common::parsePlatform(option);
- if (platform == Common::kPlatformUnknown)
- usage("Unrecognized platform '%s'", option);
- END_OPTION
-
- DO_LONG_OPTION("soundfont")
- // TODO: Verify whether the path is valid
- END_OPTION
-
- DO_LONG_OPTION_BOOL("disable-sdl-parachute")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("multi-midi")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("native-mt32")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("enable-gs")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("aspect-ratio")
- END_OPTION
-
- DO_LONG_OPTION("render-mode")
- int renderMode = Common::parseRenderMode(option);
- if (renderMode == Common::kRenderDefault)
- usage("Unrecognized render mode '%s'", option);
- END_OPTION
-
- DO_LONG_OPTION_BOOL("force-1x-overlay")
- END_OPTION
-
- DO_LONG_OPTION("savepath")
- // TODO: Verify whether the path is valid
- END_OPTION
-
- DO_LONG_OPTION_INT("talkspeed")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("copy-protection")
- END_OPTION
-
- DO_LONG_OPTION("gui-theme")
- END_OPTION
-
- DO_LONG_OPTION("target-md5")
- END_OPTION
-
-#ifndef DISABLE_SCUMM
- DO_LONG_OPTION_INT("tempo")
- END_OPTION
-
- DO_LONG_OPTION_BOOL("demo-mode")
- END_OPTION
-#endif
-
-#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
- DO_LONG_OPTION_BOOL("alt-intro")
- END_OPTION
-#endif
-
-unknownOption:
- // If we get till here, the option is unhandled and hence unknown.
- usage("Unrecognized option '%s'", argv[i]);
- }
- }
-
-
- return Common::String::emptyString;
-}
-
-
-void GameDetector::processSettings(Common::String &target, Common::StringMap &settings) {
-
- // If a target was specified, check whether there is either a game
- // domain (i.e. a target) matching this argument, or alternatively
- // whether there is a gameid matching that name.
- if (!target.empty()) {
- if (ConfMan.hasGameDomain(target) || Base::findGame(target).gameid.size() > 0) {
- Base::setTarget(target);
- } else {
- usage("Unrecognized game target '%s'", target.c_str());
- }
- }
-
-
- // The user can override the savepath with the SCUMMVM_SAVEPATH
- // environment variable. This is weaker than a --savepath on the
- // command line, but overrides the default savepath, hence it is
- // handled here, just before the command line gets parsed.
-#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) && !defined(__GP32__)
- if (!settings.contains("savepath")) {
- const char *dir = getenv("SCUMMVM_SAVEPATH");
- if (dir && *dir && strlen(dir) < MAXPATHLEN) {
- // TODO: Verify whether the path is valid
- settings["savepath"] = dir;
- }
- }
-#endif
-
-
- // Finally, store the command line settings into the config manager.
- for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) {
- Common::String key(x->_key);
- Common::String value(x->_value);
-
- // Replace any "-" in the key by "_" (e.g. change "save-slot" to "save_slot").
- for (Common::String::iterator c = key.begin(); c != key.end(); ++c)
- if (*c == '-')
- *c = '_';
-
- // Store it into ConfMan.
- ConfMan.set(key, value, Common::ConfigManager::kTransientDomain);
- }
-}
Deleted: scummvm/trunk/base/gameDetector.h
===================================================================
--- scummvm/trunk/base/gameDetector.h 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/base/gameDetector.h 2006-05-04 23:29:56 UTC (rev 22347)
@@ -1,38 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001 Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * 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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BASE_GAMEDETECTOR_H
-#define BASE_GAMEDETECTOR_H
-
-#include "common/str.h"
-#include "common/config-manager.h"
-#include "base/game.h"
-
-class GameDetector {
-public:
- static void registerDefaults();
- static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
- static void processSettings(Common::String &target, Common::StringMap &settings);
-};
-
-#endif
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/base/main.cpp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -31,7 +31,7 @@
#include "common/stdafx.h"
#include "base/engine.h"
-#include "base/gameDetector.h"
+#include "base/options.h"
#include "base/plugins.h"
#include "base/version.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/base/module.mk
===================================================================
--- scummvm/trunk/base/module.mk 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/base/module.mk 2006-05-04 23:29:56 UTC (rev 22347)
@@ -2,8 +2,8 @@
MODULE_OBJS := \
engine.o \
- gameDetector.o \
main.o \
+ options.o \
plugins.o \
version.o
Copied: scummvm/trunk/base/options.cpp (from rev 22346, scummvm/trunk/base/gameDetector.cpp)
===================================================================
--- scummvm/trunk/base/options.cpp (rev 0)
+++ scummvm/trunk/base/options.cpp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -0,0 +1,564 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/stdafx.h"
+
+#include "base/engine.h"
+#include "base/options.h"
+#include "base/plugins.h"
+#include "base/version.h"
+
+#include "common/config-manager.h"
+#include "common/system.h"
+
+#include "sound/mididrv.h"
+#include "sound/mixer.h"
+
+#ifdef UNIX
+#include <errno.h>
+#include <sys/stat.h>
+#ifdef MACOSX
+#define DEFAULT_SAVE_PATH "Documents/ScummVM Savegames"
+#else
+#define DEFAULT_SAVE_PATH ".scummvm"
+#endif
+#elif defined(__SYMBIAN32__)
+#include <errno.h>
+#include <sys/stat.h>
+#define DEFAULT_SAVE_PATH "Savegames"
+#endif
+
+static const char USAGE_STRING[] =
+ "%s: %s\n"
+ "Usage: %s [OPTIONS]... [GAME]\n"
+ "\n"
+ "Try '%s --help' for more options.\n"
+;
+
+// DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
+#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__)
+static const char HELP_STRING[] = "NoUsageString"; // save more data segment space
+#else
+static const char HELP_STRING[] =
+ "ScummVM - Graphical Adventure Game Interpreter\n"
+ "Usage: %s [OPTIONS]... [GAME]\n"
+ " -v, --version Display ScummVM version information and exit\n"
+ " -h, --help Display a brief help text and exit\n"
+ " -z, --list-games Display list of supported games and exit\n"
+ " -t, --list-targets Display list of configured targets and exit\n"
+ "\n"
+ " -c, --config=CONFIG Use alternate configuration file\n"
+ " -p, --path=PATH Path to where the game is installed\n"
+ " -x, --save-slot[=NUM] Save game slot to load (default: autosave)\n"
+ " -f, --fullscreen Force full-screen mode\n"
+ " -F, --no-fullscreen Force windowed mode\n"
+ " -g, --gfx-mode=MODE Select graphics scaler (normal,2x,3x,2xsai,\n"
+ " super2xsai,supereagle,advmame2x,advmame3x,hq2x,\n"
+ " hq3x,tv2x,dotmatrix)\n"
+ " -e, --music-driver=MODE Select music driver (see README for details)\n"
+ " -q, --language=LANG Select language (en,de,fr,it,pt,es,jp,zh,kr,se,gb,\n"
+ " hb,ru,cz)\n"
+ " -m, --music-volume=NUM Set the music volume, 0-255 (default: 192)\n"
+ " -s, --sfx-volume=NUM Set the sfx volume, 0-255 (default: 192)\n"
+ " -r, --speech-volume=NUM Set the speech volume, 0-255 (default: 192)\n"
+ " --midi-gain=NUM Set the gain for MIDI playback, 0-1000 (default:\n"
+ " 100) (only supported by some MIDI drivers)\n"
+ " -n, --subtitles Enable subtitles (use with games that have voice)\n"
+ " -b, --boot-param=NUM Pass number to the boot script (boot param)\n"
+ " -d, --debuglevel=NUM Set debug verbosity level\n"
+ " --debugflags=FLAGS Enables engine specific debug flags\n"
+ " (separated by commas)\n"
+ " -u, --dump-scripts Enable script dumping if a directory called 'dumps'\n"
+ " exists in the current directory\n"
+ "\n"
+ " --cdrom=NUM CD drive to play CD audio from (default: 0 = first\n"
+ " drive)\n"
+ " --joystick[=NUM] Enable input with joystick (default: 0 = first\n"
+ " joystick)\n"
+ " --platform=WORD Specify platform of game (allowed values: 3do, acorn,\n"
+ " amiga, atari, c64, fmtowns, nes, mac, pc, segacd,\n"
+ " windows)\n"
+ " --savepath=PATH Path to where savegames are stored\n"
+ " --soundfont=FILE Select the SoundFont for MIDI playback (only\n"
+ " supported by some MIDI drivers)\n"
+ " --multi-midi Enable combination Adlib and native MIDI\n"
+ " --native-mt32 True Roland MT-32 (disable GM emulation)\n"
+ " --enable-gs Enable Roland GS mode for MIDI playback\n"
+ " --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n"
+ " --aspect-ratio Enable aspect ratio correction\n"
+ " --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,\n"
+ " hercAmber, amiga)\n"
+ " --force-1x-overlay Make inner GUI 320x200\n"
+ "\n"
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ " --alt-intro Use alternative intro for CD versions of Beneath a\n"
+ " Steel Sky and Flight of the Amazon Queen\n"
+#endif
+ " --copy-protection Enable copy protection in SCUMM games, when\n"
+ " ScummVM disables it by default.\n"
+ " --talkspeed=NUM Set talk speed for games (default: 60)\n"
+#ifndef DISABLE_SCUMM
+ " --demo-mode Start demo mode of Maniac Mansion\n"
+ " --tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games\n"
+ " (default: 100)\n"
+#endif
+ "\n"
+ "The meaning of boolean long options can be inverted by prefixing them with\n"
+ "\"no-\", e.g. \"--no-aspect-ratio\".\n"
+;
+#endif
+
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
+static Common::String s_appName("scummvm");
+#else
+static const char *s_appName = "scummvm";
+#endif
+
+static void usage(const char *s, ...) GCC_PRINTF(1, 2);
+
+static void usage(const char *s, ...) {
+ char buf[STRINGBUFLEN];
+ va_list va;
+
+ va_start(va, s);
+ vsnprintf(buf, STRINGBUFLEN, s, va);
+ va_end(va);
+
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
+ printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str());
+#endif
+ exit(1);
+}
+
+void GameDetector::registerDefaults() {
+
+ // Graphics
+ ConfMan.registerDefault("fullscreen", false);
+ ConfMan.registerDefault("aspect_ratio", false);
+ ConfMan.registerDefault("gfx_mode", "normal");
+ ConfMan.registerDefault("render_mode", "default");
+#if defined(__SYMBIAN32__)
+ ConfMan.registerDefault("force_1x_overlay", true);
+#else
+ ConfMan.registerDefault("force_1x_overlay", false);
+#endif
+
+
+ // Sound & Music
+ ConfMan.registerDefault("music_volume", 192);
+ ConfMan.registerDefault("sfx_volume", 192);
+ ConfMan.registerDefault("speech_volume", 192);
+
+ ConfMan.registerDefault("music_mute", false);
+ ConfMan.registerDefault("sfx_mute", false);
+ ConfMan.registerDefault("speech_mute", false);
+
+ ConfMan.registerDefault("multi_midi", false);
+ ConfMan.registerDefault("native_mt32", false);
+ ConfMan.registerDefault("enable_gs", false);
+ ConfMan.registerDefault("midi_gain", 100);
+// ConfMan.registerDefault("music_driver", ???);
+
+ ConfMan.registerDefault("cdrom", 0);
+
+ // Game specific
+ ConfMan.registerDefault("path", "");
+ ConfMan.registerDefault("savepath", "");
+
+// ConfMan.registerDefault("amiga", false);
+ ConfMan.registerDefault("platform", Common::kPlatformPC);
+ ConfMan.registerDefault("language", "en");
+ ConfMan.registerDefault("subtitles", false);
+ ConfMan.registerDefault("boot_param", 0);
+ ConfMan.registerDefault("dump_scripts", false);
+ ConfMan.registerDefault("save_slot", -1);
+ ConfMan.registerDefault("autosave_period", 5 * 60); // By default, trigger autosave every 5 minutes
+
+#if !defined(DISABLE_SCUMM) || !defined(DISABLE_SWORD2)
+ ConfMan.registerDefault("object_labels", true);
+#endif
+
+ ConfMan.registerDefault("copy_protection", false);
+ ConfMan.registerDefault("talkspeed", 60);
+
+#ifndef DISABLE_SCUMM
+ ConfMan.registerDefault("demo_mode", false);
+ ConfMan.registerDefault("tempo", 0);
+#endif
+
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ ConfMan.registerDefault("alt_intro", false);
+#endif
+
+ // Miscellaneous
+ ConfMan.registerDefault("joystick_num", -1);
+ ConfMan.registerDefault("confirm_exit", false);
+ ConfMan.registerDefault("disable_sdl_parachute", false);
+#ifdef USE_ALSA
+ ConfMan.registerDefault("alsa_port", "65:0");
+#endif
+
+#ifdef DEFAULT_SAVE_PATH
+ char savePath[MAXPATHLEN];
+#ifdef UNIX
+ struct stat sb;
+ const char *home = getenv("HOME");
+ if (home && *home && strlen(home) < MAXPATHLEN) {
+ snprintf(savePath, MAXPATHLEN, "%s/%s", home, DEFAULT_SAVE_PATH);
+ if (stat(savePath, &sb) == -1) {
+ /* create the dir if it does not exist */
+ if (errno == ENOENT) {
+ if (mkdir(savePath, 0755) != 0) {
+ perror("mkdir");
+ exit(1);
+ }
+ }
+ }
+ /* check that the dir is there */
+ if (stat(savePath, &sb) == 0) {
+ ConfMan.registerDefault("savepath", savePath);
+ }
+ }
+#elif defined(__SYMBIAN32__)
+ strcpy(savePath, Symbian::GetExecutablePath());
+ strcat(savePath, DEFAULT_SAVE_PATH);
+ struct stat sb;
+ if (stat(savePath, &sb) == -1)
+ if (errno == ENOENT)// create the dir if it does not exist
+ if (mkdir(savePath, 0755) != 0)
+ error("mkdir for '%s' failed!", savePath);
+ ConfMan.registerDefault("savepath", savePath); // this should be enough...
+#endif
+#endif // #ifdef DEFAULT_SAVE_PATH
+}
+
+//
+// Various macros used by the command line parser.
+//
+
+// Use this for options which have an *optional* value
+#define DO_OPTION_OPT(shortCmd, longCmd, defaultVal) \
+ if (isLongCmd ? (!memcmp(s+2, longCmd"=", sizeof(longCmd"=") - 1)) : (tolower(s[1]) == shortCmd)) { \
+ s += 2; \
+ if (isLongCmd) \
+ s += sizeof(longCmd"=") - 1; \
+ const char *option = s; \
+ if (*s == '\0') { option = s2; i++; } \
+ if (!option) option = defaultVal; \
+ if (option) settings[longCmd] = option;
+
+// Use this for options which have a required (string) value
+#define DO_OPTION(shortCmd, longCmd) \
+ DO_OPTION_OPT(shortCmd, longCmd, 0) \
+ if (!option) usage("Option '%s' requires an argument", argv[i]);
+
+// Use this for options which have a required integer value
+#define DO_OPTION_INT(shortCmd, longCmd) \
+ DO_OPTION_OPT(shortCmd, longCmd, 0) \
+ if (!option) usage("Option '%s' requires an argument", argv[i]); \
+ char *endptr = 0; \
+ int intValue; intValue = (int)strtol(option, &endptr, 0); \
+ if (endptr == NULL || *endptr != 0) usage("--%s: Invalid number '%s'", longCmd, option);
+
+// Use this for boolean options; this distinguishes between "-x" and "-X",
+// resp. between "--some-option" and "--no-some-option".
+#define DO_OPTION_BOOL(shortCmd, longCmd) \
+ if (isLongCmd ? (!strcmp(s+2, longCmd) || !strcmp(s+2, "no-"longCmd)) : (tolower(s[1]) == shortCmd)) { \
+ bool boolValue = islower(s[1]); \
+ s += 2; \
+ if (isLongCmd) { \
+ boolValue = !strcmp(s, longCmd); \
+ s += boolValue ? (sizeof(longCmd) - 1) : (sizeof("no-"longCmd) - 1); \
+ } \
+ if (*s != '\0') goto unknownOption; \
+ const char *option = boolValue ? "true" : "false"; \
+ settings[longCmd] = option;
+
+// Use this for options which never have a value, i.e. for 'commands', like "--help".
+#define DO_OPTION_CMD(shortCmd, longCmd) \
+ if (isLongCmd ? (!strcmp(s+2, longCmd)) : (tolower(s[1]) == shortCmd)) { \
+ s += 2; \
+ if (isLongCmd) \
+ s += sizeof(longCmd) - 1; \
+ if (*s != '\0') goto unknownOption;
+
+
+#define DO_LONG_OPTION_OPT(longCmd, d) DO_OPTION_OPT(0, longCmd, d)
+#define DO_LONG_OPTION(longCmd) DO_OPTION(0, longCmd)
+#define DO_LONG_OPTION_INT(longCmd) DO_OPTION_INT(0, longCmd)
+#define DO_LONG_OPTION_BOOL(longCmd) DO_OPTION_BOOL(0, longCmd)
+#define DO_LONG_OPTION_CMD(longCmd) DO_OPTION_CMD(0, longCmd)
+
+// End an option handler
+#define END_OPTION \
+ continue; \
+ }
+
+
+Common::String GameDetector::parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
+ const char *s, *s2;
+
+ // argv[0] contains the name of the executable.
+ if (argv && argv[0]) {
+ s = strchr(argv[0], '/');
+ s_appName = s ? s : argv[0];
+ }
+
+ // We store all command line settings into a string map.
+
+ // Iterate over all command line arguments and parse them into our string map.
+ for (int i = 1; i < argc; ++i) {
+ s = argv[i];
+ s2 = (i < argc-1) ? argv[i+1] : 0;
+
+ if (s[0] != '-') {
+ // The argument doesn't start with a dash, so it's not an option.
+ // Hence it must be the target name. We currently enforce that
+ // this always comes last.
+ if (i != argc - 1)
+ usage("Stray argument '%s'", s);
+
+ // We defer checking whether this is a valid target to a later point.
+ return s;
+ } else {
+
+ bool isLongCmd = (s[0] == '-' && s[1] == '-');
+
+ DO_OPTION_CMD('h', "help")
+ printf(HELP_STRING, argv[0]);
+ exit(0);
+ END_OPTION
+
+ DO_OPTION_CMD('v', "version")
+ printf("%s\n", gScummVMFullVersion);
+ printf("Features compiled in: %s\n", gScummVMFeatures);
+ exit(0);
+ END_OPTION
+
+ DO_OPTION_CMD('t', "list-targets")
+ return "list-targets";
+ END_OPTION
+
+ DO_OPTION_CMD('z', "list-games")
+ return "list-games";
+ END_OPTION
+
+
+ // HACK FIXME TODO: This switch is intentionally *not* documented!
+ DO_LONG_OPTION_CMD("test-detector")
+ return "test-detector";
+ END_OPTION
+
+
+ DO_OPTION('c', "config")
+ END_OPTION
+
+ DO_OPTION_INT('b', "boot-param")
+ END_OPTION
+
+ DO_OPTION_OPT('d', "debuglevel", "0")
+ END_OPTION
+
+ DO_LONG_OPTION("debugflags")
+ END_OPTION
+
+ DO_OPTION('e', "music-driver")
+ if (MidiDriver::parseMusicDriver(option) < 0)
+ usage("Unrecognized music driver '%s'", option);
+ END_OPTION
+
+ DO_LONG_OPTION_INT("output-rate")
+ END_OPTION
+
+ DO_OPTION_BOOL('f', "fullscreen")
+ END_OPTION
+
+ DO_OPTION('g', "gfx-mode")
+ // Check whether 'option' specifies a valid graphics mode.
+ bool isValid = false;
+ if (!scumm_stricmp(option, "normal") || !scumm_stricmp(option, "default"))
+ isValid = true;
+ if (!isValid) {
+ const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
+ while (gm->name && !isValid) {
+ isValid = !scumm_stricmp(gm->name, option);
+ gm++;
+ }
+ }
+ if (!isValid)
+ usage("Unrecognized graphics mode '%s'", option);
+ END_OPTION
+
+ DO_OPTION_INT('m', "music-volume")
+ END_OPTION
+
+ DO_OPTION_BOOL('n', "subtitles")
+ END_OPTION
+
+ DO_OPTION('p', "path")
+ // TODO: Verify whether the path is valid
+ END_OPTION
+
+ DO_OPTION('q', "language")
+ if (Common::parseLanguage(option) == Common::UNK_LANG)
+ usage("Unrecognized language '%s'", option);
+ END_OPTION
+
+ DO_OPTION_INT('s', "sfx-volume")
+ END_OPTION
+
+ DO_OPTION_INT('r', "speech-volume")
+ END_OPTION
+
+ DO_LONG_OPTION_INT("midi-gain")
+ END_OPTION
+
+ DO_OPTION_BOOL('u', "dump-scripts")
+ END_OPTION
+
+ DO_OPTION_OPT('x', "save-slot", "0")
+ END_OPTION
+
+ DO_LONG_OPTION_INT("cdrom")
+ END_OPTION
+
+ DO_LONG_OPTION_OPT("joystick", "0")
+ END_OPTION
+
+ DO_LONG_OPTION("platform")
+ int platform = Common::parsePlatform(option);
+ if (platform == Common::kPlatformUnknown)
+ usage("Unrecognized platform '%s'", option);
+ END_OPTION
+
+ DO_LONG_OPTION("soundfont")
+ // TODO: Verify whether the path is valid
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("disable-sdl-parachute")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("multi-midi")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("native-mt32")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("enable-gs")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("aspect-ratio")
+ END_OPTION
+
+ DO_LONG_OPTION("render-mode")
+ int renderMode = Common::parseRenderMode(option);
+ if (renderMode == Common::kRenderDefault)
+ usage("Unrecognized render mode '%s'", option);
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("force-1x-overlay")
+ END_OPTION
+
+ DO_LONG_OPTION("savepath")
+ // TODO: Verify whether the path is valid
+ END_OPTION
+
+ DO_LONG_OPTION_INT("talkspeed")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("copy-protection")
+ END_OPTION
+
+ DO_LONG_OPTION("gui-theme")
+ END_OPTION
+
+ DO_LONG_OPTION("target-md5")
+ END_OPTION
+
+#ifndef DISABLE_SCUMM
+ DO_LONG_OPTION_INT("tempo")
+ END_OPTION
+
+ DO_LONG_OPTION_BOOL("demo-mode")
+ END_OPTION
+#endif
+
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ DO_LONG_OPTION_BOOL("alt-intro")
+ END_OPTION
+#endif
+
+unknownOption:
+ // If we get till here, the option is unhandled and hence unknown.
+ usage("Unrecognized option '%s'", argv[i]);
+ }
+ }
+
+
+ return Common::String::emptyString;
+}
+
+
+void GameDetector::processSettings(Common::String &target, Common::StringMap &settings) {
+
+ // If a target was specified, check whether there is either a game
+ // domain (i.e. a target) matching this argument, or alternatively
+ // whether there is a gameid matching that name.
+ if (!target.empty()) {
+ if (ConfMan.hasGameDomain(target) || Base::findGame(target).gameid.size() > 0) {
+ Base::setTarget(target);
+ } else {
+ usage("Unrecognized game target '%s'", target.c_str());
+ }
+ }
+
+
+ // The user can override the savepath with the SCUMMVM_SAVEPATH
+ // environment variable. This is weaker than a --savepath on the
+ // command line, but overrides the default savepath, hence it is
+ // handled here, just before the command line gets parsed.
+#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) && !defined(__GP32__)
+ if (!settings.contains("savepath")) {
+ const char *dir = getenv("SCUMMVM_SAVEPATH");
+ if (dir && *dir && strlen(dir) < MAXPATHLEN) {
+ // TODO: Verify whether the path is valid
+ settings["savepath"] = dir;
+ }
+ }
+#endif
+
+
+ // Finally, store the command line settings into the config manager.
+ for (Common::StringMap::const_iterator x = settings.begin(); x != settings.end(); ++x) {
+ Common::String key(x->_key);
+ Common::String value(x->_value);
+
+ // Replace any "-" in the key by "_" (e.g. change "save-slot" to "save_slot").
+ for (Common::String::iterator c = key.begin(); c != key.end(); ++c)
+ if (*c == '-')
+ *c = '_';
+
+ // Store it into ConfMan.
+ ConfMan.set(key, value, Common::ConfigManager::kTransientDomain);
+ }
+}
Copied: scummvm/trunk/base/options.h (from rev 22346, scummvm/trunk/base/gameDetector.h)
===================================================================
--- scummvm/trunk/base/options.h (rev 0)
+++ scummvm/trunk/base/options.h 2006-05-04 23:29:56 UTC (rev 22347)
@@ -0,0 +1,38 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BASE_GAMEDETECTOR_H
+#define BASE_GAMEDETECTOR_H
+
+#include "common/str.h"
+#include "common/config-manager.h"
+#include "base/game.h"
+
+class GameDetector {
+public:
+ static void registerDefaults();
+ static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
+ static void processSettings(Common::String &target, Common::StringMap &settings);
+};
+
+#endif
Modified: scummvm/trunk/dists/devcpp/scummvm.dev
===================================================================
--- scummvm/trunk/dists/devcpp/scummvm.dev 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/devcpp/scummvm.dev 2006-05-04 23:29:56 UTC (rev 22347)
@@ -70,7 +70,7 @@
BuildCmd=
[Unit10]
-FileName=..\..\base\gameDetector.h
+FileName=..\..\base\options.h
CompileCpp=1
Folder=base
Compile=1
@@ -1908,7 +1908,7 @@
AutoIncBuildNr=0
[Unit9]
-FileName=..\..\base\gameDetector.cpp
+FileName=..\..\base\options.cpp
CompileCpp=1
Folder=base
Compile=1
Modified: scummvm/trunk/dists/msevc4/gob/gob.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/gob/gob.vcp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/msevc4/gob/gob.vcp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -892,7 +892,7 @@
NODEP_CPP_GOB_C=\
"..\..\..\gob\backends\fs\fs.h"\
- "..\..\..\gob\base\gameDetector.h"\
+ "..\..\..\gob\base\options.h"\
"..\..\..\gob\base\plugins.h"\
"..\..\..\gob\common\md5.h"\
"..\..\..\gob\common\stdafx.h"\
@@ -907,7 +907,7 @@
NODEP_CPP_GOB_C=\
"..\..\..\gob\backends\fs\fs.h"\
- "..\..\..\gob\base\gameDetector.h"\
+ "..\..\..\gob\base\options.h"\
"..\..\..\gob\base\plugins.h"\
"..\..\..\gob\common\md5.h"\
"..\..\..\gob\common\stdafx.h"\
@@ -926,7 +926,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -968,7 +968,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
Modified: scummvm/trunk/dists/msevc4/queen/queen.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/queen/queen.vcp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/msevc4/queen/queen.vcp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -2734,7 +2734,7 @@
NODEP_CPP_QUEEN=\
"..\..\..\queen\backends\fs\fs.h"\
- "..\..\..\queen\base\gameDetector.h"\
+ "..\..\..\queen\base\options.h"\
"..\..\..\queen\base\plugins.h"\
"..\..\..\queen\common\config-manager.h"\
"..\..\..\queen\common\file.h"\
@@ -2763,7 +2763,7 @@
NODEP_CPP_QUEEN=\
"..\..\..\queen\backends\fs\fs.h"\
- "..\..\..\queen\base\gameDetector.h"\
+ "..\..\..\queen\base\options.h"\
"..\..\..\queen\base\plugins.h"\
"..\..\..\queen\common\config-manager.h"\
"..\..\..\queen\common\file.h"\
@@ -2796,7 +2796,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -2851,7 +2851,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -2913,7 +2913,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -2970,7 +2970,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
Modified: scummvm/trunk/dists/msevc4/saga/saga.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/saga/saga.vcp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/msevc4/saga/saga.vcp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -207,7 +207,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -264,7 +264,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -360,7 +360,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -409,7 +409,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -492,7 +492,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.cpp"\
@@ -547,7 +547,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.cpp"\
@@ -647,7 +647,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -705,7 +705,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -795,7 +795,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -832,7 +832,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -893,7 +893,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -926,7 +926,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -963,7 +963,7 @@
NODEP_CPP_GAME_=\
"..\..\..\saga\backends\fs\fs.h"\
- "..\..\..\saga\base\gameDetector.h"\
+ "..\..\..\saga\base\options.h"\
"..\..\..\saga\base\plugins.h"\
"..\..\..\saga\common\file.h"\
"..\..\..\saga\common\map.h"\
@@ -979,7 +979,7 @@
NODEP_CPP_GAME_=\
"..\..\..\saga\backends\fs\fs.h"\
- "..\..\..\saga\base\gameDetector.h"\
+ "..\..\..\saga\base\options.h"\
"..\..\..\saga\base\plugins.h"\
"..\..\..\saga\common\file.h"\
"..\..\..\saga\common\map.h"\
@@ -999,7 +999,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1045,7 +1045,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1124,7 +1124,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1171,7 +1171,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1254,7 +1254,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1308,7 +1308,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1383,7 +1383,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1416,7 +1416,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1486,7 +1486,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -1533,7 +1533,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -1642,7 +1642,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -1706,7 +1706,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -1802,7 +1802,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1844,7 +1844,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1930,7 +1930,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -1986,7 +1986,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2066,7 +2066,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2104,7 +2104,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2192,7 +2192,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -2242,7 +2242,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -2332,7 +2332,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -2378,7 +2378,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -2455,7 +2455,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2490,7 +2490,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2566,7 +2566,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2614,7 +2614,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2705,7 +2705,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2754,7 +2754,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2847,7 +2847,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2902,7 +2902,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -2964,7 +2964,7 @@
NODEP_CPP_SAGA_=\
"..\..\..\saga\backends\fs\fs.h"\
- "..\..\..\saga\base\gameDetector.h"\
+ "..\..\..\saga\base\options.h"\
"..\..\..\saga\base\plugins.h"\
"..\..\..\saga\common\config-manager.h"\
"..\..\..\saga\common\file.h"\
@@ -2998,7 +2998,7 @@
NODEP_CPP_SAGA_=\
"..\..\..\saga\backends\fs\fs.h"\
- "..\..\..\saga\base\gameDetector.h"\
+ "..\..\..\saga\base\options.h"\
"..\..\..\saga\base\plugins.h"\
"..\..\..\saga\common\config-manager.h"\
"..\..\..\saga\common\file.h"\
@@ -3036,7 +3036,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3103,7 +3103,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3220,7 +3220,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3276,7 +3276,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3392,7 +3392,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -3456,7 +3456,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -3567,7 +3567,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -3616,7 +3616,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -3725,7 +3725,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3788,7 +3788,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -3893,7 +3893,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -3939,7 +3939,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -4015,7 +4015,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -4052,7 +4052,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -4125,7 +4125,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -4167,7 +4167,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
@@ -4247,7 +4247,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
@@ -4292,7 +4292,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\debugger.h"\
Modified: scummvm/trunk/dists/msevc4/scumm/scumm.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/scumm/scumm.vcp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/msevc4/scumm/scumm.vcp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -14439,7 +14439,7 @@
NODEP_CPP_SCUMM=\
"..\..\..\scumm\backends\fs\fs.h"\
- "..\..\..\scumm\base\gameDetector.h"\
+ "..\..\..\scumm\base\options.h"\
"..\..\..\scumm\base\plugins.h"\
"..\..\..\scumm\common\config-manager.h"\
"..\..\..\scumm\common\md5.h"\
@@ -14478,7 +14478,7 @@
NODEP_CPP_SCUMM=\
"..\..\..\scumm\backends\fs\fs.h"\
- "..\..\..\scumm\base\gameDetector.h"\
+ "..\..\..\scumm\base\options.h"\
"..\..\..\scumm\base\plugins.h"\
"..\..\..\scumm\common\config-manager.h"\
"..\..\..\scumm\common\md5.h"\
@@ -14521,7 +14521,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -14613,7 +14613,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -14713,7 +14713,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -14804,7 +14804,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
Modified: scummvm/trunk/dists/msevc4/scummvm/scummvm.vcp
===================================================================
--- scummvm/trunk/dists/msevc4/scummvm/scummvm.vcp 2006-05-04 23:24:09 UTC (rev 22346)
+++ scummvm/trunk/dists/msevc4/scummvm/scummvm.vcp 2006-05-04 23:29:56 UTC (rev 22347)
@@ -3048,7 +3048,7 @@
NODEP_CPP_SYSTE=\
"..\..\..\common\backends\intern.h"\
- "..\..\..\common\base\gameDetector.h"\
+ "..\..\..\common\base\options.h"\
"..\..\..\common\common\config-manager.h"\
"..\..\..\common\common\savefile.h"\
"..\..\..\common\common\stdafx.h"\
@@ -3061,7 +3061,7 @@
NODEP_CPP_SYSTE=\
"..\..\..\common\backends\intern.h"\
- "..\..\..\common\base\gameDetector.h"\
+ "..\..\..\common\base\options.h"\
"..\..\..\common\common\config-manager.h"\
"..\..\..\common\common\savefile.h"\
"..\..\..\common\common\stdafx.h"\
@@ -3077,7 +3077,7 @@
"..\..\..\backends\ps2\fileio.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -3113,7 +3113,7 @@
"..\..\..\backends\ps2\fileio.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -3158,7 +3158,7 @@
"..\..\..\backends\ps2\fileio.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -3194,7 +3194,7 @@
"..\..\..\backends\ps2\fileio.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -6341,7 +6341,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -6406,7 +6406,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -6500,7 +6500,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -6564,7 +6564,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -7818,7 +7818,7 @@
"..\..\..\backends\wince\CEDevice.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\mutex.h"\
@@ -7858,7 +7858,7 @@
"..\..\..\backends\wince\CEDevice.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\mutex.h"\
@@ -7912,7 +7912,7 @@
"..\..\..\backends\wince\CEDevice.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\mutex.h"\
@@ -7951,7 +7951,7 @@
"..\..\..\backends\wince\CEDevice.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\mutex.h"\
@@ -7999,7 +7999,7 @@
NODEP_CPP_LAUNC=\
"..\..\..\gui\backends\fs\fs.h"\
"..\..\..\gui\base\engine.h"\
- "..\..\..\gui\base\gameDetector.h"\
+ "..\..\..\gui\base\options.h"\
"..\..\..\gui\base\plugins.h"\
"..\..\..\gui\base\version.h"\
"..\..\..\gui\common\config-manager.h"\
@@ -8025,7 +8025,7 @@
NODEP_CPP_LAUNC=\
"..\..\..\gui\backends\fs\fs.h"\
"..\..\..\gui\base\engine.h"\
- "..\..\..\gui\base\gameDetector.h"\
+ "..\..\..\gui\base\options.h"\
"..\..\..\gui\base\plugins.h"\
"..\..\..\gui\base\version.h"\
"..\..\..\gui\common\config-manager.h"\
@@ -8054,7 +8054,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -8108,7 +8108,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -8171,7 +8171,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -8225,7 +8225,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -12778,7 +12778,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\list.h"\
"..\..\..\common\map.h"\
@@ -12836,7 +12836,7 @@
"..\..\..\backends\wince\CEgui\Toolbar.h"\
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\map.h"\
@@ -12915,7 +12915,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\list.h"\
"..\..\..\common\map.h"\
@@ -14591,7 +14591,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -14619,7 +14619,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
"..\..\..\backends\wince\common\config-manager.h"\
@@ -14662,7 +14662,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -14747,7 +14747,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -14817,7 +14817,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -14882,7 +14882,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -14949,7 +14949,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15000,7 +15000,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15051,7 +15051,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15102,7 +15102,7 @@
NODEP_CPP_CEACT=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15192,7 +15192,7 @@
NODEP_CPP_CEACTI=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15223,7 +15223,7 @@
NODEP_CPP_CEACTI=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
"..\..\..\backends\wince\common\config-manager.h"\
@@ -15264,7 +15264,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -15346,7 +15346,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -15429,7 +15429,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -15504,7 +15504,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -15584,7 +15584,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -15659,7 +15659,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -15733,7 +15733,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -15787,7 +15787,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -15868,7 +15868,7 @@
NODEP_CPP_CEACTIO=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -15899,7 +15899,7 @@
NODEP_CPP_CEACTIO=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
"..\..\..\backends\wince\common\config-manager.h"\
@@ -15940,7 +15940,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -16023,7 +16023,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -16106,7 +16106,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -16182,7 +16182,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -16263,7 +16263,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -16339,7 +16339,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -16414,7 +16414,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -16468,7 +16468,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -16992,7 +16992,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17023,7 +17023,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
"..\..\..\backends\wince\common\scaler.h"\
@@ -17061,7 +17061,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\list.h"\
"..\..\..\common\map.h"\
@@ -17142,7 +17142,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\endian.h"\
"..\..\..\common\list.h"\
@@ -17210,7 +17210,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17272,7 +17272,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\list.h"\
"..\..\..\common\map.h"\
@@ -17339,7 +17339,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17390,7 +17390,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17441,7 +17441,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17492,7 +17492,7 @@
NODEP_CPP_CEKEY=\
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17578,7 +17578,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -17601,7 +17601,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -17644,7 +17644,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -17728,7 +17728,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -17796,7 +17796,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -17829,7 +17829,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -17896,7 +17896,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -17913,7 +17913,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -17930,7 +17930,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -17947,7 +17947,7 @@
NODEP_CPP_CELAU=\
"..\..\..\backends\wince\backends\fs\fs.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\common\config-manager.h"\
"..\..\..\backends\wince\gui\browser.h"\
@@ -18247,7 +18247,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -18280,7 +18280,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEgui.h"\
"..\..\..\backends\wince\CEkeys.h"\
@@ -18331,7 +18331,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -18431,7 +18431,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -18518,7 +18518,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -18598,7 +18598,7 @@
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\backends\wince\wince-sdl.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
@@ -18681,7 +18681,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -18745,7 +18745,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -18809,7 +18809,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -18873,7 +18873,7 @@
"..\..\..\backends\wince\backends\intern.h"\
"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
"..\..\..\backends\wince\base\engine.h"\
- "..\..\..\backends\wince\base\gameDetector.h"\
+ "..\..\..\backends\wince\base\options.h"\
"..\..\..\backends\wince\base\plugins.h"\
"..\..\..\backends\wince\CEActions.h"\
"..\..\..\backends\wince\CEgui.h"\
@@ -20501,7 +20501,7 @@
NODEP_CPP_ENGIN=\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\common\config-manager.h"\
"..\..\..\base\common\file.h"\
"..\..\..\base\common\savefile.h"\
@@ -20516,7 +20516,7 @@
NODEP_CPP_ENGIN=\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\common\config-manager.h"\
"..\..\..\base\common\file.h"\
"..\..\..\base\common\savefile.h"\
@@ -20533,7 +20533,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -20566,7 +20566,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\endian.h"\
@@ -20606,7 +20606,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -20635,7 +20635,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\array.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
@@ -20667,7 +20667,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -20696,7 +20696,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -20725,7 +20725,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -20754,7 +20754,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\file.h"\
"..\..\..\common\list.h"\
@@ -20786,13 +20786,13 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\base\gameDetector.cpp
+SOURCE=..\..\..\base\options.cpp
!IF "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
NODEP_CPP_GAMED=\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\base\plugins.h"\
"..\..\..\base\base\version.h"\
"..\..\..\base\common\config-manager.h"\
@@ -20807,7 +20807,7 @@
NODEP_CPP_GAMED=\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\base\plugins.h"\
"..\..\..\base\base\version.h"\
"..\..\..\base\common\config-manager.h"\
@@ -20824,7 +20824,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -20858,7 +20858,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -20893,7 +20893,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -20923,7 +20923,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -20958,7 +20958,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -20988,7 +20988,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21018,7 +21018,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21048,7 +21048,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21077,7 +21077,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\base\gameDetector.h
+SOURCE=..\..\..\base\options.h
# End Source File
# Begin Source File
@@ -21091,7 +21091,7 @@
"..\..\..\base\backends\dc\DCLauncherDialog.h"\
"..\..\..\base\backends\wince\CELauncherDialog.h"\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\base\plugins.h"\
"..\..\..\base\base\version.h"\
"..\..\..\base\common\config-manager.h"\
@@ -21114,7 +21114,7 @@
"..\..\..\base\backends\dc\DCLauncherDialog.h"\
"..\..\..\base\backends\wince\CELauncherDialog.h"\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\base\plugins.h"\
"..\..\..\base\base\version.h"\
"..\..\..\base\common\config-manager.h"\
@@ -21138,7 +21138,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -21205,7 +21205,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -21277,7 +21277,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21335,7 +21335,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\base\version.h"\
"..\..\..\common\array.h"\
@@ -21401,7 +21401,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21459,7 +21459,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21517,7 +21517,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21575,7 +21575,7 @@
"..\..\..\backends\wince\missing\unistd.h"\
"..\..\..\backends\wince\portdefs.h"\
"..\..\..\base\engine.h"\
- "..\..\..\base\gameDetector.h"\
+ "..\..\..\base\options.h"\
"..\..\..\base\plugins.h"\
"..\..\..\common\config-manager.h"\
"..\..\..\common\list.h"\
@@ -21637,7 +21637,7 @@
NODEP_CPP_PLUGI=\
"..\..\..\base\backends\fs\fs.h"\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
+ "..\..\..\base\base\options.h"\
"..\..\..\base\base\plugins.h"\
"..\..\..\base\common\stdafx.h"\
"..\..\..\base\common\util.h"\
@@ -21649,7 +21649,7 @@
NODEP_CPP_PLUGI=\
"..\..\..\base\backends\fs\fs.h"\
"..\..\..\base\base\engine.h"\
- "..\..\..\base\base\gameDetector.h"\
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list