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

core: move all desmume version #defines to version.h so that less stuff depends on it; 

win32: add svn revision detection and print it in console and title etc.
This commit is contained in:
zeromus 2009-06-18 05:25:20 +00:00
parent caf0952774
commit a2897ac198
13 changed files with 101 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/movie.cpp
View File

@ -31,6 +31,7 @@
#include "rtc.h"
#include "common.h"
#include "mic.h"
#include "version.h"
using namespace std;
bool freshMovie = false; //True when a movie loads, false when movie is altered. Used to determine if a movie has been altered since opening

1
desmume/src/saves.cpp
View File

@ -33,6 +33,7 @@
#include "render3D.h"
#include "cp15.h"
#include "GPU_osd.h"
#include "version.h"
#include "memorystream.h"
#include "readwrite.h"

59
desmume/src/types.h
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2005 Guillaume Duhamel
Copyright (C) 2008-2009 DeSmuME team
This file is part of DeSmuME
@ -14,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with DeSmuME; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef TYPES_HPP
@ -22,65 +23,15 @@
//todo - everyone will want to support this eventually, i suppose
#ifdef _MSC_VER
#include "config.h"
#include "svnrev.h"
#else
#define SVN_REV_STR ""
#endif
#ifndef _MSC_VER
#define NOSSE2
#endif
#define DESMUME_NAME "DeSmuME"
#ifdef _WIN64
#define DESMUME_PLATFORM_STRING " x64"
#else
#ifdef _WIN32
#define DESMUME_PLATFORM_STRING " x86"
#else
#define DESMUME_PLATFORM_STRING ""
#endif
#endif
#ifdef NOSSE2
#define DESMUME_CPUEXT_STRING " NOSSE2"
#else
#define DESMUME_CPUEXT_STRING ""
#endif
#ifdef DEVELOPER
#define DESMUME_FEATURE_STRING " dev+"
#else
#define DESMUME_FEATURE_STRING ""
#endif
#ifdef DEBUG
#define DESMUME_SUBVERSION_STRING " debug"
#elif defined(PUBLIC_RELEASE)
#define DESMUME_SUBVERSION_STRING ""
#else
#define DESMUME_SUBVERSION_STRING " svn"
#endif
#ifdef __INTEL_COMPILER
#define DESMUME_COMPILER " (Intel) "
#define DESMUME_COMPILER_DETAIL " (Intel) "
#elif defined(_MSC_VER)
#define DESMUME_COMPILER ""
#define DESMUME_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
#define _Py_STRINGIZE2(X) #X
//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
#else
// TODO: make for others compilers
#define DESMUME_COMPILER ""
#define DESMUME_COMPILER_DETAIL ""
#endif
#define DESMUME_VERSION_NUMERIC 90300
#define DESMUME_VERSION_STRING " " "0.9.3" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
#define DESMUME_NAME_AND_VERSION " " DESMUME_NAME DESMUME_VERSION_STRING
#ifdef _WIN32
#define strcasecmp(x,y) _stricmp(x,y)
#else

78
desmume/src/version.h Normal file
View File

@ -0,0 +1,78 @@
/* Copyright (C) 2009 DeSmuME team
This file is part of DeSmuME
DeSmuME is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
DeSmuME is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with DeSmuME; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
//todo - everyone will want to support this eventually, i suppose
#ifdef _MSC_VER
#include "svnrev.h"
#else
#define SVN_REV_STR ""
#endif
#define DESMUME_NAME "DeSmuME"
#ifdef _WIN64
#define DESMUME_PLATFORM_STRING " x64"
#else
#ifdef _WIN32
#define DESMUME_PLATFORM_STRING " x86"
#else
#define DESMUME_PLATFORM_STRING ""
#endif
#endif
#ifdef NOSSE2
#define DESMUME_CPUEXT_STRING " NOSSE2"
#else
#define DESMUME_CPUEXT_STRING ""
#endif
#ifdef DEVELOPER
#define DESMUME_FEATURE_STRING " dev+"
#else
#define DESMUME_FEATURE_STRING ""
#endif
#ifdef DEBUG
#define DESMUME_SUBVERSION_STRING " debug"
#elif defined(PUBLIC_RELEASE)
#define DESMUME_SUBVERSION_STRING ""
#else
#define DESMUME_SUBVERSION_STRING " svn" SVN_REV_STR
#endif
#ifdef __INTEL_COMPILER
#define DESMUME_COMPILER " (Intel) "
#define DESMUME_COMPILER_DETAIL " (Intel) "
#elif defined(_MSC_VER)
#define DESMUME_COMPILER ""
#define DESMUME_COMPILER_DETAIL " msvc " _Py_STRINGIZE(_MSC_VER)
#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
#define _Py_STRINGIZE2(X) #X
//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
#else
// TODO: make for others compilers
#define DESMUME_COMPILER ""
#define DESMUME_COMPILER_DETAIL ""
#endif
#define DESMUME_VERSION_NUMERIC 90300
#define DESMUME_VERSION_STRING " " "0.9.3" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
#define DESMUME_NAME_AND_VERSION " " DESMUME_NAME DESMUME_VERSION_STRING

1
desmume/src/windows/AboutBox.cpp
View File

@ -21,6 +21,7 @@
#include "../common.h"
#include "version.h"
#include "AboutBox.h"
#include "resource.h"

3
desmume/src/windows/DeSmuME_2005.vcproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="shift_jis"?>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
@ -215,6 +215,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.exe . &quot;.\defaultconfig\svnrev_template.h&quot; &quot;.\userconfig\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"

3
desmume/src/windows/DeSmuME_2008.vcproj
View File

@ -27,6 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.exe . &quot;.\defaultconfig\svnrev_template.h&quot; &quot;.\userconfig\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
@ -115,6 +116,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.exe . &quot;.\defaultconfig\svnrev_template.h&quot; &quot;.\userconfig\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
@ -207,6 +209,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="defaultconfig\SubWCRev.exe . &quot;.\defaultconfig\svnrev_template.h&quot; &quot;.\userconfig\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"

2
desmume/src/windows/console.cpp
View File

@ -25,7 +25,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <io.h>
#include "types.h"
#include "version.h"
///////////////////////////////////////////////////////////////// Console

BIN
desmume/src/windows/defaultconfig/SubWCRev.exe Normal file
View File

Binary file not shown.

5
desmume/src/windows/defaultconfig/svnrev.h Normal file
View File

@ -0,0 +1,5 @@
//this should be overridden with one generated in userconfig
//but it is here just in case to prevent compiler errors
#define SVN_REV 0
#define SVN_REV_STR "0"

2
desmume/src/windows/defaultconfig/svnrev_template.h Normal file
View File

@ -0,0 +1,2 @@
#define SVN_REV $WCREV$
#define SVN_REV_STR "$WCREV$"

1
desmume/src/windows/main.cpp
View File

@ -34,6 +34,7 @@
#include <vector>
#include <sstream>
#include <tchar.h>
#include "version.h"
#include "CWindow.h"
#include "../MMU.h"
#include "../armcpu.h"

1
desmume/src/windows/userconfig/readme.txt Normal file
View File

@ -0,0 +1 @@
see the defaultconfig directory for more information on what this is all about