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

Modified the build system so that both the original and new "revisioned" copies of EXE/DLL files are copied into the target build folder. Example: When compiling Release, pcsx2.exe will always reflect the most recent successful compilation. 

Fixed COP0's recompiled branch instructions (BC0F, BC0T, etc) -- the conditional was not implemented correctly (thanks to Refraction for spotting that one).

Used a better method of clearing the errorlevel during the Pre/Post Build steps.  Should be a little less error-prone (pun?)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@447 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-02-07 20:11:13 +00:00
parent 1709b2a74f
commit 22bacc999e
16 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2/windows/VCprojects/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin set pcsxoutdir=%2\bin
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
pcsx2/windows/VCprojects/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

6
pcsx2/x86/iCOP0.cpp
View File

@ -57,10 +57,8 @@ static void _setupBranchTest()
// everything except the lower 10 bits away. // everything except the lower 10 bits away.
MOV32MtoR( EAX, (uptr)&psHu32(DMAC_STAT) ); MOV32MtoR( EAX, (uptr)&psHu32(DMAC_STAT) );
MOV32MtoR( ECX, (uptr)&psHu32(DMAC_PCR) ); XOR32MtoR( EAX, (uptr)&psHu32(DMAC_PCR) );
AND32ItoR( EAX, 0x3ff ); // masks off all but lower 10 bits. AND32ItoR( EAX, 0x3ff );
AND32ItoR( ECX, 0x3ff );
CMP32RtoR( EAX, ECX );
} }
void recBC0F() void recBC0F()

4
pcsx2_suite_2008.sln
View File

@ -63,8 +63,8 @@ Global
{5F78E90B-BD22-47B1-9CA5-7A80F4DF5EF3}.Release|Win32.Build.0 = Release|Win32 {5F78E90B-BD22-47B1-9CA5-7A80F4DF5EF3}.Release|Win32.Build.0 = Release|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Debug|Win32.ActiveCfg = Debug|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Debug|Win32.ActiveCfg = Debug|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Debug|Win32.Build.0 = Debug|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Debug|Win32.Build.0 = Debug|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.ActiveCfg = Debug|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.ActiveCfg = Release|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.Build.0 = Debug|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.Build.0 = Release|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release|Win32.ActiveCfg = Release|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release|Win32.ActiveCfg = Release|Win32
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release|Win32.Build.0 = Release|Win32 {CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection

9
plugins/CDVDiso/src/Win32/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/CDVDiso/src/Win32/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

9
plugins/spu2ghz/src/Win32/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/spu2ghz/src/Win32/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

9
plugins/zerogs/dx/Win32/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/zerogs/dx/Win32/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

9
plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

9
plugins/zeropad/Windows/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/zeropad/Windows/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0

9
plugins/zerospu2/Win32/vsprops/postBuild.tmpl
View File

@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
rem DestExt - Extension of the target/dest! rem DestExt - Extension of the target/dest!
set pcsxoutdir=%2\bin\plugins set pcsxoutdir=%2\bin\plugins
set pcsxoutname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4 set pcsxoutname=%pcsxoutdir%\%3%4
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
IF NOT EXIST %pcsxoutdir% ( IF NOT EXIST %pcsxoutdir% (
md %pcsxoutdir% md %pcsxoutdir%
) )
copy /Y %1 %pcsxoutname% copy /Y %1 %pcsxoutname%
copy /Y %1 %pcsxnewname%
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
echo Target copied to %pcsxoutname% echo Target copied to %pcsxnewname%
) )
set ERRORLEVEL=0 exit 0

4
plugins/zerospu2/Win32/vsprops/preBuild.cmd
View File

@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd SubWCRev.exe %1 %2\postBuild.tmpl %2\postBuild.cmd
) )
rem Clear the error level -- this allows compilation to continue if SubWCRev failed. rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed.
set ERRORLEVEL=0 exit 0