piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix crash due to AR, remove LOGGING from Common.vcproj (Why won't njoy test build in debug?!)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1587 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-12-18 16:06:27 +00:00
parent f80639218f
commit 3d9c903a3b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Common/Common.vcproj
View File

@ -47,7 +47,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -341,7 +341,7 @@
Optimization="3" Optimization="3"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs" AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2" EnableEnhancedInstructionSet="2"
@ -474,10 +474,6 @@
RelativePath=".\Src\ChunkFile.h" RelativePath=".\Src\ChunkFile.h"
> >
</File> </File>
<File
RelativePath=".\Src\MsgHandler.cpp"
>
</File>
<File <File
RelativePath=".\Src\Common.h" RelativePath=".\Src\Common.h"
> >
@ -590,6 +586,10 @@
RelativePath=".\Src\MemoryUtil.h" RelativePath=".\Src\MemoryUtil.h"
> >
</File> </File>
<File
RelativePath=".\Src\MsgHandler.cpp"
>
</File>
<File <File
RelativePath=".\Src\Paths.h" RelativePath=".\Src\Paths.h"
> >

10
Source/Core/Common/Src/Common.h
View File

@ -30,12 +30,10 @@
#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");} #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
#endif #endif
#ifdef _WIN32 /* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through preprocessor definitions only */
preprocessor definitions only */ #if defined(_DEBUG) || defined(DEBUGFAST)
#if defined(_DEBUG) || defined(DEBUGFAST) #define LOGGING
#define LOGGING
#endif
#endif #endif
#include "../../../PluginSpecs/CommonTypes.h" #include "../../../PluginSpecs/CommonTypes.h"

3
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -110,7 +110,8 @@ void LoadCodes(IniFile &ini, bool forceLoad)
{ {
currentCode.active = true; currentCode.active = true;
currentCode.name = line.substr(2, line.size() - 2);; currentCode.name = line.substr(2, line.size() - 2);;
Core::DisplayMessage("AR code active: " + currentCode.name, 5000); if (!forceLoad)
Core::DisplayMessage("AR code active: " + currentCode.name, 5000);
} }
else else
{ {