From 1f01b458331c3c7c79f0a28b58f85b7dfd38ae72 Mon Sep 17 00:00:00 2001
From: tmkkmac <tmkkmac@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 24 Feb 2009 15:35:10 +0000
Subject: [PATCH] Now calmping code added in r579 is enabled only in "extra"
 setting or above, because it slows down some games

WinGUI: Disabled arguments menu in release build, for sure :p
Buildsystem: Made pcsx2 dependent on zlib, and changed post-build script a bit

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@591 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/vsprops/postBuild.tmpl | 4 ++--
 pcsx2/windows/WinMain.cpp     | 3 ++-
 pcsx2/x86/iVUmicroUpper.cpp   | 6 ++++--
 pcsx2_suite_2008.sln          | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/vsprops/postBuild.tmpl b/common/vsprops/postBuild.tmpl
index 1da9bbe380..5b26fb9758 100644
--- a/common/vsprops/postBuild.tmpl
+++ b/common/vsprops/postBuild.tmpl
@@ -32,8 +32,8 @@ if %ERRORLEVEL% NEQ 0 goto :eof
 cd %mycwd%
 
 set pcsxoutdir=%~1\%~5
-set pcsxoutname="%pcsxoutdir%\%~3%4"
-set pcsxnewname="%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%"
diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp
index 3ae1a8f31e..8fb08199c2 100644
--- a/pcsx2/windows/WinMain.cpp
+++ b/pcsx2/windows/WinMain.cpp
@@ -995,8 +995,9 @@ void CreateMainMenu() {
 	ADDMENUITEM(1, _("&Low"), ID_PROCESSLOW );
 	ADDMENUITEM(1, _("High"), ID_PROCESSHIGH);
 	ADDMENUITEM(1, _("Normal"), ID_PROCESSNORMAL);
-	if( IsDevBuild )
+	if( IsDevBuild ) {
 		ADDMENUITEM(0,_("&Arguments"), ID_RUN_CMDLINE);
+	}
 	ADDMENUITEM(0,_("Re&set"), ID_RUN_RESET);
 	ADDMENUITEM(0,_("E&xecute"), ID_RUN_EXECUTE);
 
diff --git a/pcsx2/x86/iVUmicroUpper.cpp b/pcsx2/x86/iVUmicroUpper.cpp
index d2331edb96..ebf09fe1bf 100644
--- a/pcsx2/x86/iVUmicroUpper.cpp
+++ b/pcsx2/x86/iVUmicroUpper.cpp
@@ -150,8 +150,10 @@ void recUpdateFlags(VURegs * VU, int reg, int info)
 	static const int flipMask[16] = {0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15};
 
 	if( !(info & PROCESS_VU_UPDATEFLAGS) ) {
-		if (reg != EEREC_TEMP) vuFloat2(reg, EEREC_TEMP, _X_Y_Z_W);
-		else vuFloat_useEAX(info, reg, _X_Y_Z_W);
+		if (CHECK_VU_EXTRA_OVERFLOW) {
+			if (reg != EEREC_TEMP) vuFloat2(reg, EEREC_TEMP, _X_Y_Z_W);
+			else vuFloat_useEAX(info, reg, _X_Y_Z_W);
+		}
 		return;
 	}
 
diff --git a/pcsx2_suite_2008.sln b/pcsx2_suite_2008.sln
index c9bafed4ec..0690b22484 100644
--- a/pcsx2_suite_2008.sln
+++ b/pcsx2_suite_2008.sln
@@ -4,6 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\windows\VCprojects\pcsx2_2008.vcproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{26511268-2902-4997-8421-ECD7055F9E28} = {26511268-2902-4997-8421-ECD7055F9E28}
+		{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroGS", "plugins\zerogs\dx\Win32\zerogs_2008.vcproj", "{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}"