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

GBA Core: Fix libretro build (fixes #1439)

This commit is contained in:
Vicki Pfau 2019-06-06 14:14:14 -07:00
parent 1a6b422b4c
commit 9b9aeb0c2b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gba/core.c
View File

@ -133,9 +133,11 @@ struct GBACore {
#if defined(BUILD_GLES2) || defined(BUILD_GLES3) #if defined(BUILD_GLES2) || defined(BUILD_GLES3)
struct GBAVideoGLRenderer glRenderer; struct GBAVideoGLRenderer glRenderer;
#endif #endif
#ifndef MINIMAL_CORE
struct GBAVideoProxyRenderer vlProxy; struct GBAVideoProxyRenderer vlProxy;
struct GBAVideoProxyRenderer proxyRenderer; struct GBAVideoProxyRenderer proxyRenderer;
struct mVideoLogContext* logContext; struct mVideoLogContext* logContext;
#endif
struct mCoreCallbacks logCallbacks; struct mCoreCallbacks logCallbacks;
#ifndef DISABLE_THREADING #ifndef DISABLE_THREADING
struct mVideoThreadProxy threadProxy; struct mVideoThreadProxy threadProxy;
@ -167,7 +169,9 @@ static bool _GBACoreInit(struct mCore* core) {
gbacore->overrides = NULL; gbacore->overrides = NULL;
gbacore->debuggerPlatform = NULL; gbacore->debuggerPlatform = NULL;
gbacore->cheatDevice = NULL; gbacore->cheatDevice = NULL;
#ifndef MINIMAL_CORE
gbacore->logContext = NULL; gbacore->logContext = NULL;
#endif
gbacore->audioMixer = NULL; gbacore->audioMixer = NULL;
GBACreate(gba); GBACreate(gba);
@ -189,8 +193,10 @@ static bool _GBACoreInit(struct mCore* core) {
#ifndef DISABLE_THREADING #ifndef DISABLE_THREADING
mVideoThreadProxyCreate(&gbacore->threadProxy); mVideoThreadProxyCreate(&gbacore->threadProxy);
#endif #endif
#ifndef MINIMAL_CORE
gbacore->vlProxy.logger = NULL; gbacore->vlProxy.logger = NULL;
gbacore->proxyRenderer.logger = NULL; gbacore->proxyRenderer.logger = NULL;
#endif
gbacore->keys = 0; gbacore->keys = 0;
gba->keySource = &gbacore->keys; gba->keySource = &gbacore->keys;
@ -466,11 +472,13 @@ static void _GBACoreReset(struct mCore* core) {
} }
} }
#endif #endif
#ifndef MINIMAL_CORE
if (core->videoLogger) { if (core->videoLogger) {
gbacore->proxyRenderer.logger = core->videoLogger; gbacore->proxyRenderer.logger = core->videoLogger;
GBAVideoProxyRendererCreate(&gbacore->proxyRenderer, renderer); GBAVideoProxyRendererCreate(&gbacore->proxyRenderer, renderer);
renderer = &gbacore->proxyRenderer.d; renderer = &gbacore->proxyRenderer.d;
} }
#endif
GBAVideoAssociateRenderer(&gba->video, renderer); GBAVideoAssociateRenderer(&gba->video, renderer);
} }