Permalink
Browse files

Core: Fix some linking issues when debuggers are disabled

  • Loading branch information...
endrift committed Mar 10, 2018
1 parent 253ca1d commit 3443c141692ccd12240b2f69b6d7b14083f8d149
Showing with 8 additions and 1 deletion.
  1. +2 −0 include/mgba/core/core.h
  2. +2 −1 src/core/core.c
  3. +2 −0 src/gba/core.c
  4. +2 −0 src/platform/python/engine.c
View
@@ -196,8 +196,10 @@ void* mCoreGetMemoryBlock(struct mCore* core, uint32_t start, size_t* size);
#ifdef USE_ELF
struct ELF;
bool mCoreLoadELF(struct mCore* core, struct ELF* elf);
+#ifdef USE_DEBUGGERS
void mCoreLoadELFSymbols(struct mDebuggerSymbols* symbols, struct ELF*);
#endif
+#endif
CXX_GUARD_END
View
@@ -344,6 +344,7 @@ bool mCoreLoadELF(struct mCore* core, struct ELF* elf) {
return true;
}
+#ifdef USE_DEBUGGERS
void mCoreLoadELFSymbols(struct mDebuggerSymbols* symbols, struct ELF* elf) {
size_t symIndex = ELFFindSection(elf, ".symtab");
size_t names = ELFFindSection(elf, ".strtab");
@@ -363,5 +364,5 @@ void mCoreLoadELFSymbols(struct mDebuggerSymbols* symbols, struct ELF* elf) {
mDebuggerSymbolAdd(symbols, name, syms[i].st_value, -1);
}
}
-
+#endif
#endif
View
@@ -716,7 +716,9 @@ static void _GBACoreLoadSymbols(struct mCore* core, struct VFile* vf) {
}
struct ELF* elf = ELFOpen(vf);
if (elf) {
+#ifdef USE_DEBUGGERS
mCoreLoadELFSymbols(core->symbolTable, elf);
+#endif
ELFClose(elf);
}
if (closeAfter) {
@@ -83,10 +83,12 @@ bool mPythonScriptEngineLoadScript(struct mScriptEngine* se, const char* name, s
void mPythonScriptEngineRun(struct mScriptEngine* se) {
struct mPythonScriptEngine* engine = (struct mPythonScriptEngine*) se;
+#ifdef USE_DEBUGGERS
struct mDebugger* debugger = mScriptBridgeGetDebugger(engine->sb);
if (debugger) {
mPythonSetDebugger(debugger);
}
+#endif
mPythonRunPending();
}

0 comments on commit 3443c14

Please sign in to comment.