ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed absolute dependency on stella.pro file. If it isn't present in the 

expected locations, then Stella will use built-in generic defaults.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@59 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-03-28 18:20:35 +00:00
parent 3f9a204de1
commit 47ed9dffc1
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stella/src/ui/sdl/mainSDL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: mainSDL.cxx,v 1.16 2002-03-28 05:13:13 bwmott Exp $
// $Id: mainSDL.cxx,v 1.17 2002-03-28 18:20:35 stephena Exp $
//============================================================================
#include <fstream>
@ -203,8 +203,6 @@ bool setupDisplay()
if(SDL_Init(initflags) < 0)
return false;
atexit(doQuit);
// Check which system we are running under
x11Available = false;
SDL_VERSION(&info.version);
@ -1250,8 +1248,8 @@ bool setupProperties(PropertiesSet& set)
}
else
{
cerr << "ERROR: Couldn't find stella.pro file." << endl;
return false;
set.load("", &Console::defaultProperties(), false);
return true;
}
}
@ -1298,12 +1296,17 @@ void cleanup()
if(rectList)
delete rectList;
if(SDL_JoystickOpened(0))
SDL_JoystickClose(theLeftJoystick);
if(SDL_JoystickOpened(1))
SDL_JoystickClose(theRightJoystick);
if(SDL_WasInit(SDL_INIT_EVERYTHING))
{
if(SDL_JoystickOpened(0))
SDL_JoystickClose(theLeftJoystick);
if(SDL_JoystickOpened(1))
SDL_JoystickClose(theRightJoystick);
SDL_Quit();
SDL_Quit();
}
exit(0);
}

9
stella/src/ui/x11/mainX11.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: mainX11.cxx,v 1.17 2002-03-28 05:13:13 bwmott Exp $
// $Id: mainX11.cxx,v 1.18 2002-03-28 18:20:35 stephena Exp $
//============================================================================
#include <fstream>
@ -1144,8 +1144,8 @@ bool setupProperties(PropertiesSet& set)
}
else
{
cerr << "ERROR: Couldn't find stella.pro file." << endl;
return false;
set.load("", &Console::defaultProperties(), false);
return true;
}
}
@ -1205,6 +1205,8 @@ void cleanup()
if(theRightJoystickFd)
close(theRightJoystickFd);
#endif
exit(0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1381,7 +1383,6 @@ int main(int argc, char* argv[])
// Cleanup time ...
cleanup();
return 0;
}
/**