all repos — mgba @ fdbb0ac753223279faa6c71b18a253461b74b8e6

mGBA Game Boy Advance Emulator

Fix build in g++
Jeffrey Pfau jeffrey@endrift.com
Wed, 15 Oct 2014 01:47:01 -0700
commit

fdbb0ac753223279faa6c71b18a253461b74b8e6

parent

ae256542cb18b2a9e640109c88f387b31225b33b

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

jump to
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -16,15 +16,7 @@

GameController::GameController(QObject* parent) : QObject(parent) , m_drawContext(new uint32_t[256 * 256]) - , m_threadContext { - .state = THREAD_INITIALIZED, - .debugger = 0, - .frameskip = 0, - .bios = 0, - .userData = this, - .rewindBufferCapacity = 0, - .logLevel = -1, - } + , m_threadContext() , m_activeKeys(0) , m_rom(nullptr) , m_audioThread(new QThread(this))

@@ -34,7 +26,14 @@ m_renderer = new GBAVideoSoftwareRenderer;

GBAVideoSoftwareRendererCreate(m_renderer); m_renderer->outputBuffer = (color_t*) m_drawContext; m_renderer->outputBufferStride = 256; + m_threadContext.state = THREAD_INITIALIZED; + m_threadContext.debugger = 0; + m_threadContext.frameskip = 0; + m_threadContext.bios = 0; m_threadContext.renderer = &m_renderer->d; + m_threadContext.userData = this; + m_threadContext.rewindBufferCapacity = 0; + m_threadContext.logLevel = -1; GBAInputMapInit(&m_threadContext.inputMap);