all repos — mgba @ 9b9aeb0c2bd76a1f8bb8d6d0fc6b20c7432bbaed

mGBA Game Boy Advance Emulator

GBA Core: Fix libretro build (fixes #1439)
Vicki Pfau vi@endrift.com
Thu, 06 Jun 2019 14:14:14 -0700
commit

9b9aeb0c2bd76a1f8bb8d6d0fc6b20c7432bbaed

parent

1a6b422b4c4ade66c97d589e8be7306f849fdb05

1 files changed, 8 insertions(+), 0 deletions(-)

jump to
M src/gba/core.c → src/gba/core.c 
@@ -133,9 +133,11 @@ struct GBAVideoSoftwareRenderer renderer;
 #if defined(BUILD_GLES2) || defined(BUILD_GLES3)
 	struct GBAVideoGLRenderer glRenderer;
 #endif
+#ifndef MINIMAL_CORE
 	struct GBAVideoProxyRenderer vlProxy;
 	struct GBAVideoProxyRenderer proxyRenderer;
 	struct mVideoLogContext* logContext;
+#endif
 	struct mCoreCallbacks logCallbacks;
 #ifndef DISABLE_THREADING
 	struct mVideoThreadProxy threadProxy;

@@ -167,7 +169,9 @@ core->videoLogger = NULL;
 	gbacore->overrides = NULL;
 	gbacore->debuggerPlatform = NULL;
 	gbacore->cheatDevice = NULL;
+#ifndef MINIMAL_CORE
 	gbacore->logContext = NULL;
+#endif
 	gbacore->audioMixer = NULL;
 
 	GBACreate(gba);

@@ -189,8 +193,10 @@
 #ifndef DISABLE_THREADING
 	mVideoThreadProxyCreate(&gbacore->threadProxy);
 #endif
+#ifndef MINIMAL_CORE
 	gbacore->vlProxy.logger = NULL;
 	gbacore->proxyRenderer.logger = NULL;
+#endif
 
 	gbacore->keys = 0;
 	gba->keySource = &gbacore->keys;

@@ -466,11 +472,13 @@ core->videoLogger = &gbacore->threadProxy.d;
 			}
 		}
 #endif
+#ifndef MINIMAL_CORE
 		if (core->videoLogger) {
 			gbacore->proxyRenderer.logger = core->videoLogger;
 			GBAVideoProxyRendererCreate(&gbacore->proxyRenderer, renderer);
 			renderer = &gbacore->proxyRenderer.d;
 		}
+#endif
 		GBAVideoAssociateRenderer(&gba->video, renderer);
 	}