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

git-svn-id: https://localhost/svn/Project64/trunk@48 111125ac-702d-7242-af9c-5ba8ae61c1ef

This commit is contained in:
zilmar 2010-11-30 10:47:43 +00:00
parent f6cfb46c57
commit 8fc98904a9
9 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/7zip/7zip.vcproj
View File

@ -116,7 +116,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB" PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"

2
Source/Common/Common.vcproj
View File

@ -120,7 +120,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
ForceConformanceInForLoopScope="true" ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"

2
Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
View File

@ -880,10 +880,12 @@ void R4300iOp32::LW (void) {
DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
#ifndef EXTERNAL_RELEASE
if (LogOptions.GenerateLog) if (LogOptions.GenerateLog)
{ {
Log_LW((*_PROGRAM_COUNTER),Address); Log_LW((*_PROGRAM_COUNTER),Address);
} }
#endif
if (m_Opcode.rt == 0) { return; } if (m_Opcode.rt == 0) { return; }

2
Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
View File

@ -1046,10 +1046,12 @@ void R4300iOp::LW (void) {
DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
#ifndef EXTERNAL_RELEASE
if (LogOptions.GenerateLog) if (LogOptions.GenerateLog)
{ {
Log_LW((*_PROGRAM_COUNTER),Address); Log_LW((*_PROGRAM_COUNTER),Address);
} }
#endif
if (m_Opcode.rt == 0) { return; } if (m_Opcode.rt == 0) { return; }

12
Source/Project64/N64 System/Mips/Pif Ram.cpp
View File

@ -207,6 +207,7 @@ void CPifRam::SI_DMA_READ (void)
} }
} }
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogPRDMAMemStores) { if (LogOptions.LogPRDMAMemStores) {
int count; int count;
char HexData[100], AsciiData[100], Addon[20]; char HexData[100], AsciiData[100], Addon[20];
@ -237,6 +238,7 @@ void CPifRam::SI_DMA_READ (void)
} }
LogMessage(""); LogMessage("");
} }
#endif
if (bDelaySI()) { if (bDelaySI()) {
_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false); _SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
@ -298,6 +300,7 @@ void CPifRam::SI_DMA_WRITE (void)
} }
} }
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogPRDMAMemLoads) { if (LogOptions.LogPRDMAMemLoads) {
int count; int count;
char HexData[100], AsciiData[100], Addon[20]; char HexData[100], AsciiData[100], Addon[20];
@ -329,6 +332,7 @@ void CPifRam::SI_DMA_WRITE (void)
} }
LogMessage(""); LogMessage("");
} }
#endif
PifRamWrite(); PifRamWrite();
@ -685,7 +689,9 @@ void CPifRam::ProcessControllerCommand ( int Control, BYTE * Command)
} }
break; break;
case 0x02: //read from controller pack case 0x02: //read from controller pack
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogControllerPak) { LogControllerPakData("Read: Before Gettting Results"); } if (LogOptions.LogControllerPak) { LogControllerPakData("Read: Before Gettting Results"); }
#endif
if (bShowPifRamErrors()) if (bShowPifRamErrors())
{ {
if (Command[0] != 3) { DisplayError("What am I meant to do with this Controller Command"); } 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 { } else {
Command[1] |= 0x80; Command[1] |= 0x80;
} }
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogControllerPak) { LogControllerPakData("Read: After Gettting Results"); } if (LogOptions.LogControllerPak) { LogControllerPakData("Read: After Gettting Results"); }
#endif
break; break;
case 0x03: //write controller pak case 0x03: //write controller pak
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogControllerPak) { LogControllerPakData("Write: Before Processing"); } if (LogOptions.LogControllerPak) { LogControllerPakData("Write: Before Processing"); }
#endif
if (bShowPifRamErrors()) if (bShowPifRamErrors())
{ {
if (Command[0] != 35) { DisplayError("What am I meant to do with this Controller Command"); } 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 { } else {
Command[1] |= 0x80; Command[1] |= 0x80;
} }
#ifndef EXTERNAL_RELEASE
if (LogOptions.LogControllerPak) { LogControllerPakData("Write: After Processing"); } if (LogOptions.LogControllerPak) { LogControllerPakData("Write: After Processing"); }
#endif
break; break;
default: default:
if (bShowPifRamErrors()) { DisplayError("Unknown ControllerCommand %d",Command[2]); } if (bShowPifRamErrors()) { DisplayError("Unknown ControllerCommand %d",Command[2]); }

9
Source/Project64/Project64.vcproj
View File

@ -48,13 +48,13 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHa "
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../,./" AdditionalIncludeDirectories="../,./"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXTERNAL_RELEASE;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" ExceptionHandling="2"
RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
@ -149,6 +149,7 @@
AdditionalIncludeDirectories="../,./" AdditionalIncludeDirectories="../,./"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -3580,6 +3581,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="" PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -3613,6 +3615,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="" PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -3649,6 +3652,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="" PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
@ -3682,6 +3686,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="" PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration

2
Source/Project64/User Interface/Gui Class.cpp
View File

@ -351,7 +351,9 @@ void CMainGui::Show (bool Visible) {
void CMainGui::EnterLogOptions (void) void CMainGui::EnterLogOptions (void)
{ {
#ifndef EXTERNAL_RELEASE
::EnterLogOptions((HWND)m_hMainWindow); ::EnterLogOptions((HWND)m_hMainWindow);
#endif
} }
int CMainGui::Height (void) { int CMainGui::Height (void) {

BIN
Source/Project64/User Interface/UI Resources.aps
View File

Binary file not shown.

8
Source/Project64/User Interface/UI Resources.rc
View File

@ -925,8 +925,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,7,51,47 FILEVERSION 1,7,51,48
PRODUCTVERSION 1,7,51,47 PRODUCTVERSION 1,7,51,48
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -943,12 +943,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", " " VALUE "CompanyName", " "
VALUE "FileDescription", "Project64" VALUE "FileDescription", "Project64"
VALUE "FileVersion", "1, 7, 51, 47" VALUE "FileVersion", "1, 7, 51, 48"
VALUE "InternalName", "Project64" VALUE "InternalName", "Project64"
VALUE "LegalCopyright", "Copyright © 2010" VALUE "LegalCopyright", "Copyright © 2010"
VALUE "OriginalFilename", "Project64.exe" VALUE "OriginalFilename", "Project64.exe"
VALUE "ProductName", " Project64" VALUE "ProductName", " Project64"
VALUE "ProductVersion", "1, 7, 51, 47" VALUE "ProductVersion", "1, 7, 51, 48"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"