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

Nightly builds now have the date in the version number, and look for 

stella.pro in the current directory instead of the system dir.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@994 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
urchlay 2006-01-31 14:02:08 +00:00
parent 04671c03d6
commit 89b17f8ab0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stella/src/common/Version.hxx
View File

@ -13,12 +13,18 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Version.hxx,v 1.13 2006-01-30 16:23:01 stephena Exp $
// $Id: Version.hxx,v 1.14 2006-01-31 14:02:07 urchlay Exp $
//============================================================================
#ifndef VERSION_HXX
#define VERSION_HXX
#define STELLA_VERSION "2.1.1"
#define STELLA_BASE_VERSION "2.1.1"
#ifdef NIGHTLY_BUILD
#define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD
#else
#define STELLA_VERSION STELLA_BASE_VERSION
#endif
#endif

8
stella/src/emucore/OSystem.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: OSystem.cxx,v 1.59 2006-01-30 01:01:44 stephena Exp $
// $Id: OSystem.cxx,v 1.60 2006-01-31 14:02:08 urchlay Exp $
//============================================================================
#include <cassert>
@ -156,7 +156,13 @@ void OSystem::setPropertiesDir(const string& userpath,
{
// Set up the input and output properties files
myUserPropertiesFile = userpath + BSPF_PATH_SEPARATOR + "user.pro";
#ifdef NIGHTLY_BUILD
// snapshots look in current dir
mySystemPropertiesFile = "stella.pro";
#else
// releases look in system dir
mySystemPropertiesFile = systempath + BSPF_PATH_SEPARATOR + "stella.pro";
#endif
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -