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

SVN revision fixes, mostly for linux

This commit is contained in:
jsteffens 2013-11-12 16:50:40 +00:00
parent 31d2679e07
commit 3233bf9c86
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/configure.ac
View File

@ -24,15 +24,16 @@ AC_PROG_RANLIB
dnl -- check for endianess
AC_C_BIGENDIAN
dnl -- since svn 1.7 theres only a single .svn folder in the root dir
REVISION="r0"
dnl -- since svn 1.7 theres only a single .svn folder in the root dir of the checkout
dnl -- depending on what was checked out that might be .svn or ../.svn
REVISION=0
SVN=`which svn 2>/dev/null`
if test -d "../.svn" -a "x${SVN}" != "x" -a -x "${SVN}" ; then
REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
if ( test -d .svn || test -d ../.svn ; ) && test "x${SVN}" != "x" -a -x "${SVN}" ; then
REVISION=`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
echo "$REVISION"
fi
AC_DEFINE_UNQUOTED([SVN_REV], "$REVISION", [subversion revision number])
AC_DEFINE_UNQUOTED([SVN_REV], [$REVISION], [subversion revision number])
AC_DEFINE_UNQUOTED([SVN_REV_STR], ["$REVISION"], [subversion revision number string])
dnl - Check for intltool/gettext macros
IT_PROG_INTLTOOL

15
desmume/src/saves.cpp
View File

@ -47,7 +47,6 @@
#include "path.h"
#ifdef HOST_WINDOWS
#include "svnrev.h"
#include "windows/main.h"
#endif
@ -58,13 +57,7 @@ int lastSaveState = 0; //Keeps track of last savestate used for quick save/load
#define SS_INDIRECT 0x80000000
u32 _DESMUME_version = EMU_DESMUME_VERSION_NUMERIC();
#ifdef SVN_REV
#define _SVN_REV SVN_REV
#else
#define _SVN_REV 0
#endif
u32 svn_rev = _SVN_REV;
u32 svn_rev = EMU_DESMUME_SUBVERSION_NUMERIC();
s64 save_time = 0;
savestates_t savestates[NB_STATES];
@ -1025,11 +1018,7 @@ bool savestate_save (const char *file_name)
static void writechunks(EMUFILE* os) {
DateTime tm = DateTime::get_Now();
#ifdef PUBLIC_RELEASE
svn_rev = 0xFFFFFFFF;
#else
svn_rev = _SVN_REV;
#endif
svn_rev = EMU_DESMUME_SUBVERSION_NUMERIC();
save_time = tm.get_Ticks();

14
desmume/src/version.cpp
View File

@ -35,10 +35,9 @@
#if defined(HOST_WINDOWS) || defined(DESMUME_COCOA)
#include "svnrev.h"
#else
#ifdef SVN_REV
#define SVN_REV_STR SVN_REV
#else
#define SVN_REV_STR ""
#ifndef SVN_REV
#define SVN_REV 0
#define SVN_REV_STR "0"
#endif
#endif
@ -115,6 +114,12 @@
#define DESMUME_JIT ""
#endif
#ifdef PUBLIC_RELEASE
const u32 DESMUME_SUBVERSION_NUMERIC = 0xFFFFFFFF;
#else
const u32 DESMUME_SUBVERSION_NUMERIC = SVN_REV;
#endif
const u8 DESMUME_VERSION_MAJOR = 0;
const u8 DESMUME_VERSION_MINOR = 9;
const u8 DESMUME_VERSION_BUILD = 10;
@ -124,6 +129,7 @@ const u8 DESMUME_VERSION_BUILD = 10;
#define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
u32 EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }
u32 EMU_DESMUME_SUBVERSION_NUMERIC() { return DESMUME_SUBVERSION_NUMERIC; }
const char* EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
const char* EMU_DESMUME_SUBVERSION_STRING() { return DESMUME_SUBVERSION_STRING; }
const char* EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }

1
desmume/src/version.h
View File

@ -23,6 +23,7 @@ extern const u8 DESMUME_VERSION_MINOR;
extern const u8 DESMUME_VERSION_BUILD;
u32 EMU_DESMUME_VERSION_NUMERIC();
u32 EMU_DESMUME_SUBVERSION_NUMERIC();
const char* EMU_DESMUME_VERSION_STRING();
const char* EMU_DESMUME_SUBVERSION_STRING();
const char* EMU_DESMUME_NAME_AND_VERSION();