all repos — mgba @ 23679adc3880ce330f0e87698600f42470ebc726

mGBA Game Boy Advance Emulator

Fix build after GBAThread API changes
Jeffrey Pfau jeffrey@endrift.com
Sun, 20 Jul 2014 16:38:27 -0700
commit

23679adc3880ce330f0e87698600f42470ebc726

parent

4da65d0f2f041e2db4874087e1e0d8da5a2d96be

2 files changed, 4 insertions(+), 3 deletions(-)

jump to
M src/platform/qt/GDBController.hsrc/platform/qt/GDBController.h

@@ -4,7 +4,7 @@

#include <QObject> extern "C" { -#include "gdb-stub.h" +#include "debugger/gdb-stub.h" } namespace QGBA {
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -3,6 +3,7 @@

extern "C" { #include "gba.h" #include "renderers/video-software.h" +#include "util/vfs.h" } using namespace QGBA;

@@ -27,7 +28,7 @@ m_threadContext = {

.state = THREAD_INITIALIZED, .debugger = 0, .frameskip = 0, - .biosFd = -1, + .bios = 0, .renderer = &m_renderer->d, .userData = this, .rewindBufferCapacity = 0

@@ -96,7 +97,7 @@ }

m_pauseAfterFrame = false; - m_threadContext.fd = m_rom->handle(); + m_threadContext.rom = VFileFromFD(m_rom->handle()); m_threadContext.fname = path.toLocal8Bit().constData(); GBAThreadStart(&m_threadContext); }