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 @@
/>