SF# 3084999 - added --no-gui option to run sdl version without a gui
This commit is contained in:
parent
8df644643e
commit
6e7c9f5125
|
@ -221,6 +221,9 @@ InitConfig()
|
||||||
|
|
||||||
// enable new PPU core
|
// enable new PPU core
|
||||||
config->addOption("newppu", "SDL.NewPPU", 0);
|
config->addOption("newppu", "SDL.NewPPU", 0);
|
||||||
|
|
||||||
|
// option to disable gui
|
||||||
|
config->addOption("nogui", "SDL.NoGUI", 0);
|
||||||
|
|
||||||
// GamePad 0 - 3
|
// GamePad 0 - 3
|
||||||
for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {
|
for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {
|
||||||
|
|
|
@ -119,7 +119,8 @@ Option Value Description\n\
|
||||||
--pass x Set password to use for connecting to the server.\n\
|
--pass x Set password to use for connecting to the server.\n\
|
||||||
--netkey s Use string 's' to create a unique session for the game loaded.\n\
|
--netkey s Use string 's' to create a unique session for the game loaded.\n\
|
||||||
--players x Set the number of local players.\n\
|
--players x Set the number of local players.\n\
|
||||||
--rp2mic {0,1} Replace Port 2 Start with microphone (Famicom).\n";
|
--rp2mic {0,1} Replace Port 2 Start with microphone (Famicom).\n\
|
||||||
|
--no-gui {0,1} Enable or disable the GTK GUI\n";
|
||||||
|
|
||||||
|
|
||||||
// these should be moved to the man file
|
// these should be moved to the man file
|
||||||
|
@ -682,7 +683,7 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we're not building in the gui, exit if a rom isn't specified
|
// if we're not compiling w/ the gui, exit if a rom isn't specified
|
||||||
#ifndef _GTK
|
#ifndef _GTK
|
||||||
if(romIndex <= 0) {
|
if(romIndex <= 0) {
|
||||||
|
|
||||||
|
@ -732,7 +733,10 @@ int main(int argc, char *argv[])
|
||||||
gtk_init(&argc, &argv);
|
gtk_init(&argc, &argv);
|
||||||
#endif
|
#endif
|
||||||
#ifdef _GTK
|
#ifdef _GTK
|
||||||
InitGTKSubsystem(argc, argv);
|
int noGui;
|
||||||
|
g_config->getOption("SDL.NoGUI", &noGui);
|
||||||
|
if(noGui == false)
|
||||||
|
InitGTKSubsystem(argc, argv);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(romIndex >= 0)
|
if(romIndex >= 0)
|
||||||
|
@ -786,21 +790,29 @@ int main(int argc, char *argv[])
|
||||||
g_config->getOption("SDL.Frameskip", &frameskip);
|
g_config->getOption("SDL.Frameskip", &frameskip);
|
||||||
// loop playing the game
|
// loop playing the game
|
||||||
#ifdef _GTK
|
#ifdef _GTK
|
||||||
while(1)
|
if(noGui == false)
|
||||||
{
|
{
|
||||||
if(GameInfo)
|
while(1)
|
||||||
|
{
|
||||||
|
if(GameInfo)
|
||||||
|
DoFun(frameskip);
|
||||||
|
else
|
||||||
|
SDL_Delay(1);
|
||||||
|
while(gtk_events_pending())
|
||||||
|
gtk_main_iteration_do(FALSE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while(GameInfo)
|
||||||
|
DoFun(frameskip);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
while(GameInfo)
|
while(GameInfo)
|
||||||
{
|
{
|
||||||
#endif
|
|
||||||
DoFun(frameskip);
|
DoFun(frameskip);
|
||||||
#ifdef _GTK
|
|
||||||
else
|
|
||||||
SDL_Delay(10);
|
|
||||||
while(gtk_events_pending())
|
|
||||||
gtk_main_iteration_do(FALSE);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
CloseGame();
|
CloseGame();
|
||||||
|
|
||||||
// exit the infrastructure
|
// exit the infrastructure
|
||||||
|
|
Loading…
Reference in New Issue