Force feedback no longer available as an option on non-Windows builds.

This commit is contained in:
Bart Trzynadlowski 2011-09-22 07:24:15 +00:00
parent f69bdb91b8
commit d00b03f65b

View file

@ -395,8 +395,10 @@ static void ApplySettings(CINIFile *INI, const char *section)
g_Config.emulateDSB = x ? true : false; g_Config.emulateDSB = x ? true : false;
// Drive board // Drive board
#ifdef SUPERMODEL_WIN32
if (OKAY == INI->Get(section, "ForceFeedback", x)) if (OKAY == INI->Get(section, "ForceFeedback", x))
g_Config.forceFeedback = x ? true : false; g_Config.forceFeedback = x ? true : false;
#endif
// OSD // OSD
INI->Get(section, "XResolution", g_Config.xRes); INI->Get(section, "XResolution", g_Config.xRes);
@ -479,7 +481,9 @@ static void LogConfig(void)
InfoLog("\tMusicVolume = %d", g_Config.GetMusicVolume()); InfoLog("\tMusicVolume = %d", g_Config.GetMusicVolume());
// CDriveBoardConfig // CDriveBoardConfig
#ifdef SUPERMODEL_WIN32
InfoLog("\tForceFeedback = %d", g_Config.forceFeedback); InfoLog("\tForceFeedback = %d", g_Config.forceFeedback);
#endif
// CRender3DConfig // CRender3DConfig
InfoLog("\tVertexShader = %s", g_Config.vertexShaderFile.c_str()); InfoLog("\tVertexShader = %s", g_Config.vertexShaderFile.c_str());
@ -1227,7 +1231,9 @@ static void Help(void)
puts(" -no-dsb Disable Digital Sound Board (MPEG music)"); puts(" -no-dsb Disable Digital Sound Board (MPEG music)");
puts(""); puts("");
puts("Input Options:"); puts("Input Options:");
#ifdef SUPERMODEL_WIN32
puts(" -force-feedback Enable force feedback (DirectInput, XInput)"); puts(" -force-feedback Enable force feedback (DirectInput, XInput)");
#endif
puts(" -config-inputs Configure keyboards, mice, and game controllers"); puts(" -config-inputs Configure keyboards, mice, and game controllers");
#ifdef SUPERMODEL_WIN32 #ifdef SUPERMODEL_WIN32
printf(" -input-system=<s> Input system [Default: %s]\n", g_Config.GetInputSystem()); printf(" -input-system=<s> Input system [Default: %s]\n", g_Config.GetInputSystem());
@ -1373,11 +1379,13 @@ int main(int argc, char **argv)
n = 0; n = 0;
CmdLine.Set("Global", "EmulateDSB", n); CmdLine.Set("Global", "EmulateDSB", n);
} }
#ifdef SUPERMODEL_WIN32
else if (!strcmp(argv[i], "-force-feedback")) else if (!strcmp(argv[i], "-force-feedback"))
{ {
n = 1; n = 1;
CmdLine.Set("Global", "ForceFeedback", n); CmdLine.Set("Global", "ForceFeedback", n);
} }
#endif
else if (!strncmp(argv[i],"-res",4)) else if (!strncmp(argv[i],"-res",4))
{ {
unsigned x, y; unsigned x, y;