Skip to content

Commit 0216b55

Browse files
committed
Fix build break when game memory is disabled
1 parent 68aa823 commit 0216b55

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Core/GameEngine/Include/Common/MiniDumper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,14 @@ class MiniDumper
102102
HANDLE m_dumpThread;
103103
DWORD m_dumpThreadId;
104104

105+
#ifndef DISABLE_GAMEMEMORY
105106
// Internal memory dumping progress state
106107
int m_dumpObjectsState;
107108
int m_dumpObjectsSubState;
108109
int m_dmaRawBlockIndex;
109110

110111
AllocationRangeIterator m_rangeIter;
112+
#endif
111113

112114
// Function pointer to MiniDumpWriteDump in dbghelp.dll
113115
typedef BOOL(WINAPI* MiniDumpWriteDump_t)(

Core/GameEngine/Source/Common/System/MiniDumper.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ MiniDumper::MiniDumper()
6767
m_quitting = NULL;
6868
m_dumpThread = NULL;
6969
m_dumpThreadId = 0;
70+
#ifndef DISABLE_GAMEMEMORY
7071
m_dumpObjectsState = 0;
7172
m_dumpObjectsSubState = 0;
7273
m_dmaRawBlockIndex = 0;
74+
#endif
7375
memset(m_dumpDir, 0, ARRAY_SIZE(m_dumpDir));
7476
memset(m_dumpFile, 0, ARRAY_SIZE(m_dumpFile));
7577
memset(m_sysDbgHelpPath, 0, ARRAY_SIZE(m_sysDbgHelpPath));
@@ -533,6 +535,7 @@ BOOL MiniDumper::CallbackInternal(const MINIDUMP_CALLBACK_INPUT& input, MINIDUMP
533535
return retVal;
534536
}
535537

538+
#ifndef DISABLE_GAMEMEMORY
536539
BOOL MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
537540
{
538541
BOOL moreToDo = TRUE;
@@ -660,6 +663,7 @@ BOOL MiniDumper::DumpMemoryObjects(ULONG64& memoryBase, ULONG& memorySize)
660663

661664
return moreToDo;
662665
}
666+
#endif
663667

664668
// Comparator for sorting files by last modified time (newest first)
665669
bool MiniDumper::CompareByLastWriteTime(const FileInfo& a, const FileInfo& b)

0 commit comments

Comments
 (0)