mirror of https://github.com/PCSX2/pcsx2.git
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:
parent
1709b2a74f
commit
22bacc999e
|
@ -8,14 +8,17 @@ rem DestFile - Base filename of the target/dest, without extension!
|
|||
rem DestExt - Extension of the target/dest!
|
||||
|
||||
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% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -57,10 +57,8 @@ static void _setupBranchTest()
|
|||
// everything except the lower 10 bits away.
|
||||
|
||||
MOV32MtoR( EAX, (uptr)&psHu32(DMAC_STAT) );
|
||||
MOV32MtoR( ECX, (uptr)&psHu32(DMAC_PCR) );
|
||||
AND32ItoR( EAX, 0x3ff ); // masks off all but lower 10 bits.
|
||||
AND32ItoR( ECX, 0x3ff );
|
||||
CMP32RtoR( EAX, ECX );
|
||||
XOR32MtoR( EAX, (uptr)&psHu32(DMAC_PCR) );
|
||||
AND32ItoR( EAX, 0x3ff );
|
||||
}
|
||||
|
||||
void recBC0F()
|
||||
|
|
|
@ -63,8 +63,8 @@ Global
|
|||
{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.Build.0 = Debug|Win32
|
||||
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.ActiveCfg = Debug|Win32
|
||||
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.Build.0 = Debug|Win32
|
||||
{CDD9DB83-3BD9-4ED8-BB83-399A2F65F022}.Devel|Win32.ActiveCfg = Release|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.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
|
@ -8,14 +8,17 @@ 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
|
||||
set pcsxoutname=%pcsxoutdir%\%3%4
|
||||
set pcsxnewname=%pcsxoutdir%\%3-r$WCREV$$WCMODS?m:$%4
|
||||
|
||||
IF NOT EXIST %pcsxoutdir% (
|
||||
md %pcsxoutdir%
|
||||
)
|
||||
|
||||
copy /Y %1 %pcsxoutname%
|
||||
copy /Y %1 %pcsxnewname%
|
||||
|
||||
if ERRORLEVEL 0 (
|
||||
echo Target copied to %pcsxoutname%
|
||||
echo Target copied to %pcsxnewname%
|
||||
)
|
||||
set ERRORLEVEL=0
|
||||
exit 0
|
||||
|
|
|
@ -15,6 +15,6 @@ if %ERRORLEVEL% NEQ 0 (
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue