diff --git a/common/svnrev_generic.h b/common/svnrev_generic.h new file mode 100644 index 0000000000..e4ed01e00b --- /dev/null +++ b/common/svnrev_generic.h @@ -0,0 +1,23 @@ +// svnrev_unknown.h --> svnrev.h +// +// This file acts as a placebo for people who do not have TortoiseSVN installed. +// It provides "empty" revision information to the Pcsx2 Playground projects in +// the absence of real revisions derived from the repository being built. +// +// This file does not affect application/dll builds in any significant manner, +// other than the lack of automatic revision tags inserted into the app (which +// is very convenient but hardly necessary). +// +// See svn_template.h for more information on how the process of revision +// templating works. +// +// If you would like to enable automatic revisin tagging, TortoiseSVN can be +// downloaded from http://tortoisesvn.tigris.org + +#define SVN_REV_UNKNOWN + +// The following defines are included so that code will still compile even if it +// doesn't check for the SVN_REV_UNKNOWN define. + +#define SVN_REV 0 +#define SVN_MODS "" \ No newline at end of file diff --git a/common/svnrev_template.h b/common/svnrev_template.h index c8806d96ae..a67a4629bd 100644 --- a/common/svnrev_template.h +++ b/common/svnrev_template.h @@ -1,2 +1,18 @@ +// svnrev_template.h --> svnrev.h +// +// This file acts as a template for the automatic SVN revision/version tag. +// It is used by the utility SubWCrev.exe to create an "svnrev.h" file for +// whichever project is being compiled (as indicated by command line options +// passed to SubWCRev.exe during the project's pre-build step). +// +// The SubWCRev.exe utility is part of TortoiseSVN and requires several DLLs +// installed by TortoiseSVN, so it will only be available if you have TortoiseSVN +// installed on your system. If you do not have it installed, a generic template +// is used instead (see svnrev_generic.h). Having TortoiseSVN is handy but not +// necessary. If you do not have it installed, everything will still compile +// fine except without the SVN revision tagged to the application/dll version. +// +// TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org + #define SVN_REV $WCREV$ #define SVN_MODS $WCMODS?1:0$ \ No newline at end of file diff --git a/common/svnrev_unknown.h b/common/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/common/svnrev_unknown.h @@ -0,0 +1,23 @@ +// svnrev_genric.h --> svnrev.h +// +// This file acts as a placebo for people who do not have TortoiseSVN installed. +// It provides "empty" revision information to the Pcsx2 Playground projects in +// the absence of real revisions derived from the repository being built. +// +// This file does not affect application/dll builds in any significant manner, +// other than the lack of automatic revision tags inserted into the app (which +// is very convenient but hardly necessary). +// +// See svn_template.h for more information on how the process of revision +// templating works. +// +// If you would like to enable automatic revisin tagging, TortoiseSVN can be +// downloaded from http://tortoisesvn.tigris.org + +#define SVN_REV_UNKNOWN + +// The following defines are included so that code will still compile even if it +// doesn't check for the SVN_REV_UNKNOWN define. + +#define SVN_REV 0 +#define SVN_MODS "" \ No newline at end of file diff --git a/common/updateRevision.cmd b/common/updateRevision.cmd new file mode 100644 index 0000000000..3c7b2a9b83 --- /dev/null +++ b/common/updateRevision.cmd @@ -0,0 +1,10 @@ +@echo off +echo %1 %2 %3\svnrev_template.h %2\svnrev.h + +%1 %2 %3\svnrev_template.h %2\svnrev.h +if not ERRORLEVEL 0 ( + echo Automatic revision update unavailable, using generic template instead. + echo You can safely ignore this message - see svnrev.h for details. + copy /Y %3\svnrev_unknown.h %2\svnrev.h +) +set ERRORLEVEL=0 diff --git a/plugins/spu2ghz/SPU2ghz_vs2008.vcproj b/plugins/spu2ghz/SPU2ghz_vs2008.vcproj index 020903574a..da1312cf70 100644 --- a/plugins/spu2ghz/SPU2ghz_vs2008.vcproj +++ b/plugins/spu2ghz/SPU2ghz_vs2008.vcproj @@ -27,7 +27,7 @@ > TickInterval*72 ) + if( dClocks > TickInterval*96 ) { ConLog( " * SPU2 > TimeUpdate Sanity Check (Tick Delta: %d) (PS2 Ticks: %d)\n", dClocks/TickInterval, cClocks/TickInterval ); - dClocks = TickInterval*72; + dClocks = TickInterval*96; lClocks = cClocks-dClocks; } @@ -737,7 +768,7 @@ void __fastcall TimeUpdate(u32 cClocks, u32 syncType) { Cores[1].MADR=Cores[1].TADR; Cores[1].DMAICounter=0; - ConLog( "* SPU2 > AutoDMA 7 Callback! %d\n", Cycles ); + //ConLog( "* SPU2 > DMA 7 Callback! %d\n", Cycles ); if(dma7callback) dma7callback(); } else {