[Stella-commits] CVS: stella/src/win32 SettingsWin32.cxx,1.10,1.11

[Steve A. <ste...@us...>]

Update of /cvsroot/stella/stella/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12868/src/win32

Modified Files:
	SettingsWin32.cxx 
Log Message:
Updated the Windows port concerning the recent Settings class changes.

Mark, if you're reading this, the OSX port will need to be fixed as well.
The changes are trivial.


Index: SettingsWin32.cxx
===================================================================
RCS file: /cvsroot/stella/stella/src/win32/SettingsWin32.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SettingsWin32.cxx	6 Aug 2004 01:53:50 -0000	1.10
--- SettingsWin32.cxx	18 Aug 2004 21:20:55 -0000	1.11
***************
*** 41,55 ****
    _mkdir(myStateDir.c_str());

  

!   myUserPropertiesFile   = stelladir + "stella.pro";

!   mySystemPropertiesFile = stelladir + "stella.pro";

!   myUserConfigFile       = stelladir + "stella.ini";

!   mySystemConfigFile     = stelladir + "stella.ini";

  

    // Set up the names of the input and output config files

!   mySettingsOutputFilename = myUserConfigFile;

!   if(fileExists(myUserConfigFile))

!     mySettingsInputFilename = myUserConfigFile;

    else

!     mySettingsInputFilename = mySystemConfigFile;

  

    // Now create Win32 specific settings

--- 41,66 ----
    _mkdir(myStateDir.c_str());

  

!   string userPropertiesFile   = stelladir + "stella.pro";

! //  string systemPropertiesFile = stelladir + "stella.pro";

!   string userConfigFile       = stelladir + "stella.ini";

! //  string systemConfigFile     = stelladir + "stella.ini";

  

    // Set up the names of the input and output config files

!   myConfigOutputFile = userConfigFile;

!   if(fileExists(userConfigFile))

!     myConfigInputFile = userConfigFile;

! //  else if(fileExists(systemConfigFile))

! //    myConfigInputFile = systemConfigFile;

    else

!     myConfigInputFile = "";

! 

!   // Set up the input and output properties files

!   myPropertiesOutputFile = userPropertiesFile;

!   if(fileExists(userPropertiesFile))

!     myPropertiesInputFile = userPropertiesFile;

! //  else if(fileExists(systemPropertiesFile))

! //    myPropertiesInputFile = systemPropertiesFile;

!   else

!     myPropertiesInputFile = "";

  

    // Now create Win32 specific settings