piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions 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
Show Stats 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"
Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@ -341,7 +341,7 @@
Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
@ -474,10 +474,6 @@
RelativePath=".\Src\ChunkFile.h"
>
</File>
<File
RelativePath=".\Src\MsgHandler.cpp"
>
</File>
<File
RelativePath=".\Src\Common.h"
>
@ -590,6 +586,10 @@
RelativePath=".\Src\MemoryUtil.h"
>
</File>
<File
RelativePath=".\Src\MsgHandler.cpp"
>
</File>
<File
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.");}
#endif
#ifdef _WIN32
/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
preprocessor definitions only */
#if defined(_DEBUG) || defined(DEBUGFAST)
#define LOGGING
#endif
/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
preprocessor definitions only */
#if defined(_DEBUG) || defined(DEBUGFAST)
#define LOGGING
#endif
#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.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
{