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

Updated Mac code to reflect setting changes which were implemented in other versions 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@357 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
markgrebe 2005-02-18 01:05:23 +00:00
parent 248fcb92dc
commit 44203e578a
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
stella/src/macosx/SettingsMACOSX.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SettingsMACOSX.cxx,v 1.2 2004-08-02 04:08:10 markgrebe Exp $ // $Id: SettingsMACOSX.cxx,v 1.3 2005-02-18 01:05:23 markgrebe Exp $
//============================================================================ //============================================================================
#include <cassert> #include <cassert>
@ -51,17 +51,25 @@ SettingsMACOSX::SettingsMACOSX()
if(access(myStateDir.c_str(), R_OK|W_OK|X_OK) != 0 ) if(access(myStateDir.c_str(), R_OK|W_OK|X_OK) != 0 )
mkdir(myStateDir.c_str(), 0777); mkdir(myStateDir.c_str(), 0777);
myUserPropertiesFile = stelladir + "stella.pro"; string userPropertiesFile = stelladir + "stella.pro";
mySystemPropertiesFile = stelladir + "stella.pro"; // mySystemPropertiesFile = stelladir + "stella.pro";
myUserConfigFile = ""; string userConfigFile = "";
mySystemConfigFile = ""; // mySystemConfigFile = "";
// Set up the names of the input and output config files // Set up the names of the input and output config files
mySettingsOutputFilename = myUserConfigFile; myConfigOutputFile = userConfigFile;
mySettingsInputFilename = myUserConfigFile; if (fileExists(userConfigFile))
myConfigInputFile = userConfigFile;
else
myConfigInputFile = "";
mySnapshotFile = ""; myPropertiesOutputFile = userPropertiesFile;
myStateFile = ""; if(fileExists(userPropertiesFile))
myPropertiesInputFile = userPropertiesFile;
// Êelse if(fileExists(systemPropertiesFile)
// Ê ÊmyPropertiesInputFile = systemPropertiesFile;
else
myPropertiesInputFile = "";
// Now create MacOSX specific settings // Now create MacOSX specific settings
#ifdef SNAPSHOT_SUPPORT #ifdef SNAPSHOT_SUPPORT
@ -115,9 +123,7 @@ string SettingsMACOSX::stateFilename(const string& md5, uInt32 state)
{ {
ostringstream buf; ostringstream buf;
buf << myStateDir << md5 << ".st" << state; buf << myStateDir << md5 << ".st" << state;
return buf.str();
myStateFile = buf.str();
return myStateFile;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
stella/src/macosx/mainSDL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: mainSDL.cxx,v 1.6 2004-08-02 04:08:10 markgrebe Exp $ // $Id: mainSDL.cxx,v 1.7 2005-02-18 01:05:23 markgrebe Exp $
//============================================================================ //============================================================================
#include <fstream> #include <fstream>
@ -924,8 +924,8 @@ bool setupProperties(PropertiesSet& set)
{ {
bool useMemList = false; bool useMemList = false;
string theAlternateProFile = theSettings->getString("altpro"); string theAlternateProFile = theSettings->getString("altpro");
string theUserProFile = theSettings->userPropertiesFilename(); string theUserProFile = theSettings->propertiesInputFilename();
string theSystemProFile = theSettings->systemPropertiesFilename(); string theSystemProFile = theSettings->propertiesOutputFilename();
#ifdef DEVELOPER_SUPPORT #ifdef DEVELOPER_SUPPORT
// If the user wishes to merge any property modifications to the // If the user wishes to merge any property modifications to the