This commit is contained in:
squall-leonhart 2009-08-10 07:13:07 +00:00
parent aa75c7dccb
commit d7a58068d8
12 changed files with 87 additions and 18 deletions

BIN
project/SubWCRev.exe Normal file

Binary file not shown.

View File

@ -30,7 +30,8 @@
>
<Tool
Name="VCPreBuildEventTool"
ExcludedFromBuild="true"
CommandLine="SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h"
ExcludedFromBuild="false"
/>
<Tool
Name="VCCustomBuildTool"
@ -138,7 +139,8 @@
>
<Tool
Name="VCPreBuildEventTool"
ExcludedFromBuild="true"
CommandLine="SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h"
ExcludedFromBuild="false"
/>
<Tool
Name="VCCustomBuildTool"
@ -201,7 +203,7 @@
AdditionalLibraryDirectories=""
GenerateManifest="true"
AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib;libcmtd.lib"
GenerateDebugInformation="false"
AssemblyDebug="2"
GenerateMapFile="false"
@ -816,6 +818,10 @@
RelativePath="..\..\src\Util.h"
>
</File>
<File
RelativePath="..\..\src\version.h"
>
</File>
</Filter>
<Filter
Name="IO"

View File

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

View File

@ -19,9 +19,7 @@
#ifndef __AUTOBUILD_H__
#define __AUTOBUILD_H__
#ifndef VERSION
#define VERSION "1.8.0-SVN"
#endif
#include "version.h"
//change the FALSE to TRUE for autoincrement of build number
#define INCREMENT_VERSION FALSE
#define FILEVER 1,8,0,600

57
src/version.h Normal file
View File

@ -0,0 +1,57 @@
// -*- C++ -*-
// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
// Copyright (C) 1999-2003 Forgotten
// Copyright (C) 2004 Forgotten and the VBA development team
// This program 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, or(at your option)
// any later version.
//
// This program 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 this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define VBA_NAME "VisualBoyAdvance"
#ifdef WIN32
#include "svnrev.h"
#else
#ifdef SVN_REV
#define SVN_REV_STR SVN_REV
#else
#define SVN_REV_STR ""
#endif
#endif
#define VBA_FEATURE_STRING ""
#ifdef DEBUG
#define VBA_SUBVERSION_STRING " debug"
#elif defined(PUBLIC_RELEASE)
#define VBA_SUBVERSION_STRING ""
#else
#define VBA_SUBVERSION_STRING "-SVN" SVN_REV_STR
#endif
#if defined(_MSC_VER)
#define VBA_COMPILER ""
#define VBA_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 VBA_COMPILER ""
#define VBA_COMPILER_DETAIL ""
#endif
#define VBA_VERSION_STRING " " "1.8.0" VBA_SUBVERSION_STRING VBA_FEATURE_STRING VBA_COMPILER
#define VBA_NAME_AND_VERSION " " VBA_NAME VBA_VERSION_STRING
#define VBA_NAME_AND_SUBVERSION " " VBA_NAME VBA_SUBVERSION_STRING

View File

@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
AboutDialog::AboutDialog(CWnd* pParent /*=NULL*/)
: CDialog(AboutDialog::IDD, pParent)
{
m_version = _T(VERSION);
m_version = _T(VBA_VERSION_STRING);
m_date = _T(__DATE__);
}
@ -48,7 +48,7 @@ BOOL AboutDialog::OnInitDialog()
m_translator.SubclassDlgItem(IDC_TRANSLATOR_URL, this);
}
m_link.SetWindowText("http://vba-m.ngemu.com");
m_link.SetWindowText("http://vba-m.com");
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE

View File

@ -140,7 +140,7 @@ CString BugReport::createReport()
theApp.winCheckFullscreen();
CString report = "";
AppendFormat(report, "Emu version : %s\r\n", VERSION);
AppendFormat(report, "Emu version : %s\r\n", VBA_VERSION_STRING);
AppendFormat(report, "Emu Type : %s\r\n",
#ifdef DEBUG
"Debug Version"

View File

@ -19,6 +19,8 @@
#include "../gb/gbCheats.h"
#include "../gb/gbGlobals.h"
#include "../version.h"
extern void remoteCleanUp();
extern void InterframeCleanup();
@ -148,7 +150,7 @@ void MainWnd::OnFileClose()
}
emulating = 0;
RedrawWindow(NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
systemSetTitle("VisualBoyAdvance");
systemSetTitle(VBA_NAME_AND_SUBVERSION);
}
void MainWnd::OnUpdateFileClose(CCmdUI* pCmdUI)

View File

@ -14,13 +14,13 @@ void MainWnd::OnHelpAbout()
void MainWnd::OnHelpFaq()
{
::ShellExecute(0, _T("open"), "http://vba-m.ngemu.com/forum/",
::ShellExecute(0, _T("open"), "http://vba-m.com/forum/",
0, 0, SW_SHOWNORMAL);
}
void MainWnd::OnHelpBugreport()
{
::ShellExecute(0, _T("open"), "http://sourceforge.net/tracker/?atid=1023154&group_id=212795&func=browse",
::ShellExecute(0, _T("open"), "http://sourceforge.net/tracker/?group_id=212795&atid=1023154",
0, 0, SW_SHOWNORMAL);
}

View File

@ -31,6 +31,8 @@
#include "../gb/gbSound.h"
#include "../gba/GBALink.h"
#include "../version.h"
#include <tchar.h>
@ -661,7 +663,7 @@ BOOL MainWnd::OnOptionsEmulatorShowSpeed(UINT nID)
switch(nID) {
case ID_OPTIONS_EMULATOR_SHOWSPEED_NONE:
theApp.showSpeed = 0;
systemSetTitle("VisualBoyAdvance");
systemSetTitle(VBA_NAME_AND_SUBVERSION);
break;
case ID_OPTIONS_EMULATOR_SHOWSPEED_PERCENTAGE:
theApp.showSpeed = 1;

View File

@ -30,6 +30,8 @@
#include "../gb/gbSound.h"
#include "../common/SoundDriver.h"
#include "../version.h"
/* Link
---------------------*/
#include "../gba/GBALink.h"
@ -1060,9 +1062,9 @@ void systemShowSpeed(int speed)
if(theApp.videoOption <= VIDEO_4X && theApp.showSpeed) {
CString buffer;
if(theApp.showSpeed == 1)
buffer.Format("VisualBoyAdvance-%3d%%", systemSpeed);
buffer.Format(VBA_NAME_AND_SUBVERSION "-%3d%%", systemSpeed);
else
buffer.Format("VisualBoyAdvance-%3d%%(%d, %d fps)", systemSpeed,
buffer.Format(VBA_NAME_AND_SUBVERSION "-%3d%%(%d, %d fps)", systemSpeed,
systemFrameSkip,
theApp.showRenderedFrames);
@ -2026,7 +2028,7 @@ bool VBA::preInitialize()
pWnd->CreateEx(
styleEx,
wndClass,
_T("VisualBoyAdvance"),
_T(VBA_NAME_AND_SUBVERSION),
style,
x, y,
winSizeX, winSizeY,

View File

@ -207,7 +207,7 @@ BEGIN
ICON IDI_MAINICON,IDC_STATIC,6,6,20,20
CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,36,6,138,8
CTEXT "Copyright © 2008 VBA-M development team",IDC_STATIC,6,48,168,8
CTEXT "http://vba-m.ngemu.com",IDC_URL,7,138,168,8
CTEXT "http://vba-m.com",IDC_URL,7,138,168,8
RTEXT "Version:",IDC_STATIC,36,18,54,8
LTEXT "",IDC_VERSION,96,18,78,8,SS_NOPREFIX
GROUPBOX "VBA-M dev team:",IDC_STATIC,7,65,90,66
@ -1586,7 +1586,7 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "VBA-M comes with NO WARRANTY. Use it at your own risk."
VALUE "CompanyName", "http://vba-m.ngemu.com/"
VALUE "CompanyName", "http://vba-m.com/"
VALUE "FileDescription", "GB/C/A emulator for Windows"
VALUE "FileVersion", "1, 8, 0, 0"
VALUE "InternalName", "VBA-M"