From 8fc98904a9481287c9504e5d9dfcfc151cd83ff3 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 30 Nov 2010 10:47:43 +0000
Subject: [PATCH] git-svn-id: https://localhost/svn/Project64/trunk@48
 111125ac-702d-7242-af9c-5ba8ae61c1ef

---
 Source/7zip/7zip.vcproj                       |   2 +-
 Source/Common/Common.vcproj                   |   2 +-
 .../Interpreter/Interpreter Ops 32.cpp        |   2 ++
 .../Interpreter/Interpreter Ops.cpp           |   2 ++
 Source/Project64/N64 System/Mips/Pif Ram.cpp  |  12 ++++++++++++
 Source/Project64/Project64.vcproj             |   9 +++++++--
 Source/Project64/User Interface/Gui Class.cpp |   2 ++
 .../Project64/User Interface/UI Resources.aps | Bin 308612 -> 308612 bytes
 .../Project64/User Interface/UI Resources.rc  |   8 ++++----
 9 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Source/7zip/7zip.vcproj b/Source/7zip/7zip.vcproj
index 7bd3ddc6d..da5523ecd 100644
--- a/Source/7zip/7zip.vcproj
+++ b/Source/7zip/7zip.vcproj
@@ -116,7 +116,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/Source/Common/Common.vcproj b/Source/Common/Common.vcproj
index c0dd11fc8..865793b05 100644
--- a/Source/Common/Common.vcproj
+++ b/Source/Common/Common.vcproj
@@ -120,7 +120,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="false"
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
index 6f127795d..103aac6b5 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
@@ -880,10 +880,12 @@ void R4300iOp32::LW (void) {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
 	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
 
+#ifndef EXTERNAL_RELEASE
 	if (LogOptions.GenerateLog)
 	{ 
 		Log_LW((*_PROGRAM_COUNTER),Address);
 	}
+#endif
 
 	if (m_Opcode.rt == 0) { return; }
 
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
index 101920f31..8d7661f8f 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
@@ -1046,10 +1046,12 @@ void R4300iOp::LW (void) {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
 	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
 
+#ifndef EXTERNAL_RELEASE
 	if (LogOptions.GenerateLog)
 	{ 
 		Log_LW((*_PROGRAM_COUNTER),Address);
 	}
+#endif
 
 	if (m_Opcode.rt == 0) { return; }
 
diff --git a/Source/Project64/N64 System/Mips/Pif Ram.cpp b/Source/Project64/N64 System/Mips/Pif Ram.cpp
index 1b3be14c8..abced1c14 100644
--- a/Source/Project64/N64 System/Mips/Pif Ram.cpp	
+++ b/Source/Project64/N64 System/Mips/Pif Ram.cpp	
@@ -207,6 +207,7 @@ void CPifRam::SI_DMA_READ (void)
 		}
 	}
 	
+#ifndef EXTERNAL_RELEASE
 	if (LogOptions.LogPRDMAMemStores) {
 		int count;
 		char HexData[100], AsciiData[100], Addon[20];
@@ -237,6 +238,7 @@ void CPifRam::SI_DMA_READ (void)
 		}
 		LogMessage("");
 	}
+#endif
 
 	if (bDelaySI()) {
 		_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
@@ -298,6 +300,7 @@ void CPifRam::SI_DMA_WRITE (void)
 		}
 	}
 	
+#ifndef EXTERNAL_RELEASE
 	if (LogOptions.LogPRDMAMemLoads) {
 		int count;
 		char HexData[100], AsciiData[100], Addon[20];
@@ -329,6 +332,7 @@ void CPifRam::SI_DMA_WRITE (void)
 		}
 		LogMessage("");
 	}
+#endif
 
 	PifRamWrite();
 	
@@ -685,7 +689,9 @@ void CPifRam::ProcessControllerCommand ( int Control, BYTE * Command)
 		}
 		break;
 	case 0x02: //read from controller pack
+#ifndef EXTERNAL_RELEASE
 		if (LogOptions.LogControllerPak) { LogControllerPakData("Read: Before Gettting Results"); }
+#endif
 		if (bShowPifRamErrors()) 
 		{
 			if (Command[0] != 3) { DisplayError("What am I meant to do with this Controller Command"); }
@@ -707,10 +713,14 @@ void CPifRam::ProcessControllerCommand ( int Control, BYTE * Command)
 		} else {
 			Command[1] |= 0x80;
 		}
+#ifndef EXTERNAL_RELEASE
 		if (LogOptions.LogControllerPak) { LogControllerPakData("Read: After Gettting Results"); }
+#endif
 		break;
 	case 0x03: //write controller pak
+#ifndef EXTERNAL_RELEASE
 		if (LogOptions.LogControllerPak) { LogControllerPakData("Write: Before Processing"); }
+#endif
 		if (bShowPifRamErrors()) 
 		{
 			if (Command[0] != 35) { DisplayError("What am I meant to do with this Controller Command"); }
@@ -731,7 +741,9 @@ void CPifRam::ProcessControllerCommand ( int Control, BYTE * Command)
 		} else {
 			Command[1] |= 0x80;
 		}
+#ifndef EXTERNAL_RELEASE
 		if (LogOptions.LogControllerPak) { LogControllerPakData("Write: After Processing"); }
+#endif
 		break;
 	default:
 		if (bShowPifRamErrors()) { DisplayError("Unknown ControllerCommand %d",Command[2]); }
diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj
index 7e269840c..8e25ea7b9 100644
--- a/Source/Project64/Project64.vcproj
+++ b/Source/Project64/Project64.vcproj
@@ -48,13 +48,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../,./"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				ExceptionHandling="2"
+				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="false"
@@ -149,6 +149,7 @@
 				AdditionalIncludeDirectories="../,./"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
+				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				BufferSecurityCheck="false"
@@ -3580,6 +3581,7 @@
 							Name="VCCLCompilerTool"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -3613,6 +3615,7 @@
 							Name="VCCLCompilerTool"
 							AdditionalIncludeDirectories=""
 							PreprocessorDefinitions=""
+							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -3649,6 +3652,7 @@
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								PreprocessorDefinitions=""
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
@@ -3682,6 +3686,7 @@
 								Name="VCCLCompilerTool"
 								AdditionalIncludeDirectories=""
 								PreprocessorDefinitions=""
+								UsePrecompiledHeader="0"
 							/>
 						</FileConfiguration>
 						<FileConfiguration
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index 0b4552ccf..bafaa41ab 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -351,7 +351,9 @@ void CMainGui::Show (bool Visible) {
 
 void CMainGui::EnterLogOptions (void) 
 {
+#ifndef EXTERNAL_RELEASE
 	::EnterLogOptions((HWND)m_hMainWindow);
+#endif
 }
 
 int CMainGui::Height (void) {
diff --git a/Source/Project64/User Interface/UI Resources.aps b/Source/Project64/User Interface/UI Resources.aps
index fc685dd8798ad9aca4ff7f1109c2e987fb6bc69c..0316ad8843f9649397a7c67098b88642046f06b1 100644
GIT binary patch
delta 48
zcmZp9E!6T_sG)_ig{g&k3(JjVoCXZW4D1Yy3<lF5E@Sz~XtDkBau#z&AkDp!rIH5#
DowyIx

delta 48
zcmZp9E!6T_sG)_ig{g&k3(JjVocavL4D1Yy4Eoa_E@Sz~XukdOau#z&AkDp!rIH5#
Doo)}&

diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc
index b20bef594..35872b790 100644
--- a/Source/Project64/User Interface/UI Resources.rc	
+++ b/Source/Project64/User Interface/UI Resources.rc	
@@ -925,8 +925,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,51,47
- PRODUCTVERSION 1,7,51,47
+ FILEVERSION 1,7,51,48
+ PRODUCTVERSION 1,7,51,48
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -943,12 +943,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", " "
             VALUE "FileDescription", "Project64"
-            VALUE "FileVersion", "1, 7, 51, 47"
+            VALUE "FileVersion", "1, 7, 51, 48"
             VALUE "InternalName", "Project64"
             VALUE "LegalCopyright", "Copyright © 2010"
             VALUE "OriginalFilename", "Project64.exe"
             VALUE "ProductName", " Project64"
-            VALUE "ProductVersion", "1, 7, 51, 47"
+            VALUE "ProductVersion", "1, 7, 51, 48"
         END
     END
     BLOCK "VarFileInfo"