From 968bd03866f1cdefea20aa781a4c157606704b70 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Fri, 6 Feb 2009 12:07:40 +0000 Subject: [PATCH] Improved the Win32 build model for plugins and Pcsx2, which introduces several improvements: * Binaries are generated in their respective $(ProjectDir)/bin folder (various clutter like ilk, pdb, and other non-distributed files). * Executables and DLLs are renamed with the SVN revision tag and copied to the final $(SolutionDir)/bin folder. So pcsx2 now automatically generates as "pcsx2-pg-r705.exe" :) * Checkout/Update speeds from SVN should be a lot faster now. * Some build errors fixed for people who don't use TortoiseSvn. ... and this is a big commit so I probably missed something. ;) git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@707 a6443dda-0b58-4228-96e9-037be469359c --- pcsx2/windows/VCprojects/pcsx2_2008.vcproj | 32 ++----------- .../windows/VCprojects/vsprops/common.vsprops | 10 +++- .../windows/VCprojects/vsprops/postBuild.tmpl | 21 +++++++++ .../VCprojects/vsprops/postBuild.unknown | 21 +++++++++ pcsx2/windows/VCprojects/vsprops/preBuild.cmd | 20 ++++++++ .../VCprojects/vsprops/svnrev_template.h | 18 ++++++++ .../VCprojects/vsprops/svnrev_unknown.h | 23 ++++++++++ .../CDVDiso/src/Win32/CDVDiso_vs2008.vcproj | 20 +++----- .../Win32/vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ .../CDVDiso/src/Win32/vsprops/postBuild.tmpl | 21 +++++++++ .../src/Win32/vsprops/postBuild.unknown | 21 +++++++++ .../CDVDiso/src/Win32/vsprops/preBuild.cmd | 20 ++++++++ .../src/Win32/vsprops/svnrev_template.h | 18 ++++++++ .../src/Win32/vsprops/svnrev_unknown.h | 23 ++++++++++ plugins/spu2ghz/src/Win32/SPU2ghz.def | 2 +- .../spu2ghz/src/Win32/SPU2ghz_vs2008.vcproj | 43 ++++------------- .../Win32/vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ .../spu2ghz/src/Win32/vsprops/postBuild.tmpl | 21 +++++++++ .../src/Win32/vsprops/postBuild.unknown | 21 +++++++++ .../spu2ghz/src/Win32/vsprops/preBuild.cmd | 20 ++++++++ .../src/Win32/vsprops/svnrev_template.h | 18 ++++++++ .../src/Win32/vsprops/svnrev_unknown.h | 23 ++++++++++ .../Win32/vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ .../zerogs/dx/Win32/vsprops/postBuild.tmpl | 21 +++++++++ .../zerogs/dx/Win32/vsprops/postBuild.unknown | 21 +++++++++ plugins/zerogs/dx/Win32/vsprops/preBuild.cmd | 20 ++++++++ .../zerogs/dx/Win32/vsprops/svnrev_template.h | 18 ++++++++ .../zerogs/dx/Win32/vsprops/svnrev_unknown.h | 23 ++++++++++ plugins/zerogs/dx/Win32/zerogs_2008.vcproj | 46 ++++--------------- .../Win32/vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ .../opengl/Win32/vsprops/postBuild.tmpl | 21 +++++++++ .../opengl/Win32/vsprops/postBuild.unknown | 21 +++++++++ .../zerogs/opengl/Win32/vsprops/preBuild.cmd | 20 ++++++++ .../opengl/Win32/vsprops/svnrev_template.h | 18 ++++++++ .../opengl/Win32/vsprops/svnrev_unknown.h | 23 ++++++++++ .../zerogs/opengl/Win32/zerogsogl_2008.vcproj | 36 ++++----------- plugins/zerogs/opengl/zpipe.cpp | 2 +- plugins/zeropad/Windows/ZeroPAD_2008.vcproj | 23 +++------- .../vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ .../zeropad/Windows/vsprops/postBuild.tmpl | 21 +++++++++ .../zeropad/Windows/vsprops/postBuild.unknown | 21 +++++++++ plugins/zeropad/Windows/vsprops/preBuild.cmd | 20 ++++++++ .../zeropad/Windows/vsprops/svnrev_template.h | 18 ++++++++ .../zeropad/Windows/vsprops/svnrev_unknown.h | 23 ++++++++++ plugins/zeropad/zeropad.h | 1 - plugins/zerospu2/Win32/ZeroSPU2.def | 4 +- plugins/zerospu2/Win32/ZeroSPU2_2008.vcproj | 28 ++--------- .../Win32/vsprops/pcsx2_plugin_common.vsprops | 34 ++++++++++++++ plugins/zerospu2/Win32/vsprops/postBuild.tmpl | 21 +++++++++ .../zerospu2/Win32/vsprops/postBuild.unknown | 21 +++++++++ plugins/zerospu2/Win32/vsprops/preBuild.cmd | 20 ++++++++ .../zerospu2/Win32/vsprops/svnrev_template.h | 18 ++++++++ .../zerospu2/Win32/vsprops/svnrev_unknown.h | 23 ++++++++++ plugins/zerospu2/zerospu2.h | 2 - 54 files changed, 984 insertions(+), 190 deletions(-) create mode 100644 pcsx2/windows/VCprojects/vsprops/postBuild.tmpl create mode 100644 pcsx2/windows/VCprojects/vsprops/postBuild.unknown create mode 100644 pcsx2/windows/VCprojects/vsprops/preBuild.cmd create mode 100644 pcsx2/windows/VCprojects/vsprops/svnrev_template.h create mode 100644 pcsx2/windows/VCprojects/vsprops/svnrev_unknown.h create mode 100644 plugins/CDVDiso/src/Win32/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/CDVDiso/src/Win32/vsprops/postBuild.tmpl create mode 100644 plugins/CDVDiso/src/Win32/vsprops/postBuild.unknown create mode 100644 plugins/CDVDiso/src/Win32/vsprops/preBuild.cmd create mode 100644 plugins/CDVDiso/src/Win32/vsprops/svnrev_template.h create mode 100644 plugins/CDVDiso/src/Win32/vsprops/svnrev_unknown.h create mode 100644 plugins/spu2ghz/src/Win32/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/spu2ghz/src/Win32/vsprops/postBuild.tmpl create mode 100644 plugins/spu2ghz/src/Win32/vsprops/postBuild.unknown create mode 100644 plugins/spu2ghz/src/Win32/vsprops/preBuild.cmd create mode 100644 plugins/spu2ghz/src/Win32/vsprops/svnrev_template.h create mode 100644 plugins/spu2ghz/src/Win32/vsprops/svnrev_unknown.h create mode 100644 plugins/zerogs/dx/Win32/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/zerogs/dx/Win32/vsprops/postBuild.tmpl create mode 100644 plugins/zerogs/dx/Win32/vsprops/postBuild.unknown create mode 100644 plugins/zerogs/dx/Win32/vsprops/preBuild.cmd create mode 100644 plugins/zerogs/dx/Win32/vsprops/svnrev_template.h create mode 100644 plugins/zerogs/dx/Win32/vsprops/svnrev_unknown.h create mode 100644 plugins/zerogs/opengl/Win32/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl create mode 100644 plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown create mode 100644 plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd create mode 100644 plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h create mode 100644 plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h create mode 100644 plugins/zeropad/Windows/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/zeropad/Windows/vsprops/postBuild.tmpl create mode 100644 plugins/zeropad/Windows/vsprops/postBuild.unknown create mode 100644 plugins/zeropad/Windows/vsprops/preBuild.cmd create mode 100644 plugins/zeropad/Windows/vsprops/svnrev_template.h create mode 100644 plugins/zeropad/Windows/vsprops/svnrev_unknown.h create mode 100644 plugins/zerospu2/Win32/vsprops/pcsx2_plugin_common.vsprops create mode 100644 plugins/zerospu2/Win32/vsprops/postBuild.tmpl create mode 100644 plugins/zerospu2/Win32/vsprops/postBuild.unknown create mode 100644 plugins/zerospu2/Win32/vsprops/preBuild.cmd create mode 100644 plugins/zerospu2/Win32/vsprops/svnrev_template.h create mode 100644 plugins/zerospu2/Win32/vsprops/svnrev_unknown.h diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index c93ebc2873..5bfe35c0ef 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -20,8 +20,6 @@ - - - @@ -2655,14 +2637,6 @@ - - - @@ -2700,7 +2674,7 @@ > + + 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/pcsx2/windows/VCprojects/vsprops/svnrev_unknown.h b/pcsx2/windows/VCprojects/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/pcsx2/windows/VCprojects/vsprops/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/plugins/CDVDiso/src/Win32/CDVDiso_vs2008.vcproj b/plugins/CDVDiso/src/Win32/CDVDiso_vs2008.vcproj index 325086b4f2..5f26b427ca 100644 --- a/plugins/CDVDiso/src/Win32/CDVDiso_vs2008.vcproj +++ b/plugins/CDVDiso/src/Win32/CDVDiso_vs2008.vcproj @@ -18,14 +18,12 @@ + + + + + + + diff --git a/plugins/CDVDiso/src/Win32/vsprops/postBuild.tmpl b/plugins/CDVDiso/src/Win32/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/CDVDiso/src/Win32/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/CDVDiso/src/Win32/vsprops/postBuild.unknown b/plugins/CDVDiso/src/Win32/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/CDVDiso/src/Win32/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/CDVDiso/src/Win32/vsprops/preBuild.cmd b/plugins/CDVDiso/src/Win32/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/CDVDiso/src/Win32/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/CDVDiso/src/Win32/vsprops/svnrev_template.h b/plugins/CDVDiso/src/Win32/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/CDVDiso/src/Win32/vsprops/svnrev_template.h @@ -0,0 +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/plugins/CDVDiso/src/Win32/vsprops/svnrev_unknown.h b/plugins/CDVDiso/src/Win32/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/CDVDiso/src/Win32/vsprops/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/plugins/spu2ghz/src/Win32/SPU2ghz.def b/plugins/spu2ghz/src/Win32/SPU2ghz.def index dc025a74ef..78a2e48d7d 100644 --- a/plugins/spu2ghz/src/Win32/SPU2ghz.def +++ b/plugins/spu2ghz/src/Win32/SPU2ghz.def @@ -17,7 +17,7 @@ ; ; SPU2ghz.def : Declares the module parameters for the DLL. -LIBRARY "SPU2ghz" +;LIBRARY "SPU2ghz" EXPORTS ; Explicit exports can go here diff --git a/plugins/spu2ghz/src/Win32/SPU2ghz_vs2008.vcproj b/plugins/spu2ghz/src/Win32/SPU2ghz_vs2008.vcproj index 1191582b00..d565450d68 100644 --- a/plugins/spu2ghz/src/Win32/SPU2ghz_vs2008.vcproj +++ b/plugins/spu2ghz/src/Win32/SPU2ghz_vs2008.vcproj @@ -17,18 +17,13 @@ - @@ -55,8 +50,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" EnableFiberSafeOptimizations="true" - AdditionalIncludeDirectories="..\;"$(ProjectDir)";..\common;..\3rdparty" - PreprocessorDefinitions="FLOAT_SAMPLES;NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;SPU2GHZ_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="FLOAT_SAMPLES;NDEBUG;_USRDLL;SPU2GHZ_EXPORTS" StringPooling="true" RuntimeLibrary="0" StructMemberAlignment="5" @@ -94,7 +88,6 @@ GenerateDebugInformation="true" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\Release/SPU2ghz.lib" TargetMachine="1" /> - @@ -155,8 +143,7 @@ - @@ -247,7 +229,6 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\Release/SPU2ghz.tlb" HeaderFileName="" /> - @@ -362,8 +336,7 @@ + + + + + + + diff --git a/plugins/spu2ghz/src/Win32/vsprops/postBuild.tmpl b/plugins/spu2ghz/src/Win32/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/spu2ghz/src/Win32/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/spu2ghz/src/Win32/vsprops/postBuild.unknown b/plugins/spu2ghz/src/Win32/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/spu2ghz/src/Win32/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/spu2ghz/src/Win32/vsprops/preBuild.cmd b/plugins/spu2ghz/src/Win32/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/spu2ghz/src/Win32/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/spu2ghz/src/Win32/vsprops/svnrev_template.h b/plugins/spu2ghz/src/Win32/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/spu2ghz/src/Win32/vsprops/svnrev_template.h @@ -0,0 +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/plugins/spu2ghz/src/Win32/vsprops/svnrev_unknown.h b/plugins/spu2ghz/src/Win32/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/spu2ghz/src/Win32/vsprops/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/plugins/zerogs/dx/Win32/vsprops/pcsx2_plugin_common.vsprops b/plugins/zerogs/dx/Win32/vsprops/pcsx2_plugin_common.vsprops new file mode 100644 index 0000000000..47160ff19e --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/pcsx2_plugin_common.vsprops @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/plugins/zerogs/dx/Win32/vsprops/postBuild.tmpl b/plugins/zerogs/dx/Win32/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerogs/dx/Win32/vsprops/postBuild.unknown b/plugins/zerogs/dx/Win32/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerogs/dx/Win32/vsprops/preBuild.cmd b/plugins/zerogs/dx/Win32/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/zerogs/dx/Win32/vsprops/svnrev_template.h b/plugins/zerogs/dx/Win32/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/svnrev_template.h @@ -0,0 +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/plugins/zerogs/dx/Win32/vsprops/svnrev_unknown.h b/plugins/zerogs/dx/Win32/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/zerogs/dx/Win32/vsprops/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/plugins/zerogs/dx/Win32/zerogs_2008.vcproj b/plugins/zerogs/dx/Win32/zerogs_2008.vcproj index b87fc0b9e9..a0562266c5 100644 --- a/plugins/zerogs/dx/Win32/zerogs_2008.vcproj +++ b/plugins/zerogs/dx/Win32/zerogs_2008.vcproj @@ -17,18 +17,13 @@ - @@ -55,8 +50,8 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;..\common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS" + AdditionalIncludeDirectories="..\x86\;..\..\ZeroGSShaders\" + PreprocessorDefinitions="NDEBUG;_USRDLL;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2" StringPooling="true" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -88,7 +83,6 @@ GenerateDebugInformation="true" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\Release/GSsoftdx.lib" TargetMachine="1" /> - - @@ -141,8 +126,8 @@ Name="VCCLCompilerTool" Optimization="0" EnableFiberSafeOptimizations="true" - AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;..\common" - PreprocessorDefinitions="D3D_DEBUG_INFO;_USRDLL;_DEBUG;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS" + AdditionalIncludeDirectories="..\x86\;..\..\ZeroGSShaders\" + PreprocessorDefinitions="D3D_DEBUG_INFO;_USRDLL;_DEBUG;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;" BasicRuntimeChecks="3" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -187,25 +172,16 @@ - - @@ -232,8 +208,8 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories=".\;..\;..\x86\;..\..\ZeroGSShaders\;..\common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;__i386__;RELEASE_TO_PUBLIC;ZEROGS_SSE2;_CRT_SECURE_NO_WARNINGS" + AdditionalIncludeDirectories="..\x86\;..\..\ZeroGSShaders\" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;__i386__;RELEASE_TO_PUBLIC;ZEROGS_SSE2" StringPooling="true" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -287,10 +263,6 @@ - diff --git a/plugins/zerogs/opengl/Win32/vsprops/pcsx2_plugin_common.vsprops b/plugins/zerogs/opengl/Win32/vsprops/pcsx2_plugin_common.vsprops new file mode 100644 index 0000000000..47160ff19e --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/pcsx2_plugin_common.vsprops @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl b/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown b/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd b/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h b/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h @@ -0,0 +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/plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h b/plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/zerogs/opengl/Win32/vsprops/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/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj b/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj index e6c6d44e75..b045520744 100644 --- a/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj +++ b/plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj @@ -17,8 +17,7 @@ - @@ -135,8 +127,8 @@ - - diff --git a/plugins/zerogs/opengl/zpipe.cpp b/plugins/zerogs/opengl/zpipe.cpp index 3dc4b17d6c..703ab487b8 100644 --- a/plugins/zerogs/opengl/zpipe.cpp +++ b/plugins/zerogs/opengl/zpipe.cpp @@ -8,7 +8,7 @@ #include //#define ZLIB_WINAPI -#include "zlib.h" +#include "zlib/zlib.h" int def(char *src, char *dst, int bytes_to_compress, int *bytes_after_compressed) ; int inf(char *src, char *dst, int bytes_to_decompress, int maximum_after_decompress) ; diff --git a/plugins/zeropad/Windows/ZeroPAD_2008.vcproj b/plugins/zeropad/Windows/ZeroPAD_2008.vcproj index 900eb75e01..257e4591c3 100644 --- a/plugins/zeropad/Windows/ZeroPAD_2008.vcproj +++ b/plugins/zeropad/Windows/ZeroPAD_2008.vcproj @@ -18,18 +18,15 @@ diff --git a/plugins/zeropad/Windows/vsprops/pcsx2_plugin_common.vsprops b/plugins/zeropad/Windows/vsprops/pcsx2_plugin_common.vsprops new file mode 100644 index 0000000000..47160ff19e --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/pcsx2_plugin_common.vsprops @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/plugins/zeropad/Windows/vsprops/postBuild.tmpl b/plugins/zeropad/Windows/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zeropad/Windows/vsprops/postBuild.unknown b/plugins/zeropad/Windows/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zeropad/Windows/vsprops/preBuild.cmd b/plugins/zeropad/Windows/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/zeropad/Windows/vsprops/svnrev_template.h b/plugins/zeropad/Windows/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/svnrev_template.h @@ -0,0 +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/plugins/zeropad/Windows/vsprops/svnrev_unknown.h b/plugins/zeropad/Windows/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/zeropad/Windows/vsprops/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/plugins/zeropad/zeropad.h b/plugins/zeropad/zeropad.h index e86aafe9df..1ec4a91c00 100644 --- a/plugins/zeropad/zeropad.h +++ b/plugins/zeropad/zeropad.h @@ -19,7 +19,6 @@ #ifndef __PAD_H__ #define __PAD_H__ -#define _CRT_SECURE_NO_DEPRECATE #include #include diff --git a/plugins/zerospu2/Win32/ZeroSPU2.def b/plugins/zerospu2/Win32/ZeroSPU2.def index eb4b75ec8a..d6a7764c7d 100644 --- a/plugins/zerospu2/Win32/ZeroSPU2.def +++ b/plugins/zerospu2/Win32/ZeroSPU2.def @@ -1,7 +1,7 @@ ; SPU2null.def : Declares the module parameters for the DLL. -LIBRARY "SPU2null" -DESCRIPTION 'SPU2 Null Driver' +;LIBRARY "SPU2null" +;DESCRIPTION 'SPU2 Null Driver' EXPORTS ; Explicit exports can go here diff --git a/plugins/zerospu2/Win32/ZeroSPU2_2008.vcproj b/plugins/zerospu2/Win32/ZeroSPU2_2008.vcproj index 64fd372721..69f12e7bb8 100644 --- a/plugins/zerospu2/Win32/ZeroSPU2_2008.vcproj +++ b/plugins/zerospu2/Win32/ZeroSPU2_2008.vcproj @@ -18,15 +18,10 @@ - - - - diff --git a/plugins/zerospu2/Win32/vsprops/pcsx2_plugin_common.vsprops b/plugins/zerospu2/Win32/vsprops/pcsx2_plugin_common.vsprops new file mode 100644 index 0000000000..47160ff19e --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/pcsx2_plugin_common.vsprops @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/plugins/zerospu2/Win32/vsprops/postBuild.tmpl b/plugins/zerospu2/Win32/vsprops/postBuild.tmpl new file mode 100644 index 0000000000..7d580fc171 --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/postBuild.tmpl @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerospu2/Win32/vsprops/postBuild.unknown b/plugins/zerospu2/Win32/vsprops/postBuild.unknown new file mode 100644 index 0000000000..7e99d6db43 --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/postBuild.unknown @@ -0,0 +1,21 @@ +@echo off +rem +rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt +rem +rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. +rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. +rem DestFile - Base filename of the target/dest, without extension! +rem DestExt - Extension of the target/dest! + +set pcsxoutdir=%2\bin\plugins +set pcsxoutname=%pcsxoutdir%%3%4 + +IF NOT EXIST %pcsxoutdir% ( + md %pcsxoutdir% +) + +copy /Y %1 %pcsxoutname% +if ERRORLEVEL 0 ( + echo Target copied to %pcsxoutname% +) +set ERRORLEVEL=0 diff --git a/plugins/zerospu2/Win32/vsprops/preBuild.cmd b/plugins/zerospu2/Win32/vsprops/preBuild.cmd new file mode 100644 index 0000000000..1203feb216 --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/preBuild.cmd @@ -0,0 +1,20 @@ +@echo off + +rem Usage: preBuild.cmd ProjectSrcDir VspropsDir +rem +rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. +rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. + +SubWCRev.exe %1 %2\svnrev_template.h %1\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 %2\svnrev_unknown.h %1\svnrev.h + copy /Y %2\postBuild.unknown %2\postBuild.cmd +) else ( + SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd +) + +rem Clear the error level -- this allows compilation to continue if SubWCRev failed. + +set ERRORLEVEL=0 diff --git a/plugins/zerospu2/Win32/vsprops/svnrev_template.h b/plugins/zerospu2/Win32/vsprops/svnrev_template.h new file mode 100644 index 0000000000..f2656ef1e8 --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/svnrev_template.h @@ -0,0 +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/plugins/zerospu2/Win32/vsprops/svnrev_unknown.h b/plugins/zerospu2/Win32/vsprops/svnrev_unknown.h new file mode 100644 index 0000000000..4872e23b20 --- /dev/null +++ b/plugins/zerospu2/Win32/vsprops/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/plugins/zerospu2/zerospu2.h b/plugins/zerospu2/zerospu2.h index 1e82c0c2c7..438abf75e9 100644 --- a/plugins/zerospu2/zerospu2.h +++ b/plugins/zerospu2/zerospu2.h @@ -19,8 +19,6 @@ #ifndef __SPU2_H__ #define __SPU2_H__ -#define _CRT_SECURE_NO_DEPRECATE - #include #include #include