all repos — mgba @ c300da9be6e85928dc6068aaadc3f9275e476418

mGBA Game Boy Advance Emulator

Qt: Incomplete non-GBA build fixes
Vicki Pfau vi@endrift.com
Mon, 02 Dec 2019 19:18:48 -0800
commit

c300da9be6e85928dc6068aaadc3f9275e476418

parent

d3ec40b392db348f3ab1273e90d68e32e7717a15

M src/platform/qt/CheatsView.cppsrc/platform/qt/CheatsView.cpp

@@ -129,7 +129,6 @@ m_model.addSet(set);

} void CheatsView::removeSet() { - GBACheatSet* set; QModelIndexList selection = m_ui.cheatList->selectionModel()->selectedIndexes(); if (selection.count() < 1) { return;
M src/platform/qt/MultiplayerController.cppsrc/platform/qt/MultiplayerController.cpp

@@ -22,11 +22,13 @@ , gbNode(node)

{ } +#ifdef M_CORE_GBA MultiplayerController::Player::Player(CoreController* coreController, GBASIOLockstepNode* node) : controller(coreController) , gbaNode(node) { } +#endif MultiplayerController::MultiplayerController() { mLockstepInit(&m_lockstep);

@@ -71,10 +73,12 @@ MultiplayerController* controller = static_cast<MultiplayerController*>(lockstep->context);

if (!id) { for (int i = 1; i < controller->m_players.count(); ++i) { Player* player = &controller->m_players[i]; +#ifdef M_CORE_GBA if (player->controller->platform() == PLATFORM_GBA && player->gbaNode->d.p->mode != controller->m_players[0].gbaNode->d.p->mode) { player->controller->setSync(true); continue; } +#endif player->controller->setSync(false); player->cyclesPosted += cycles; if (player->awake < 1) {
M src/platform/qt/MultiplayerController.hsrc/platform/qt/MultiplayerController.h

@@ -45,8 +45,12 @@ void gameDetached();

private: struct Player { +#ifdef M_CORE_GB Player(CoreController* controller, GBSIOLockstepNode* node); +#endif +#ifdef M_CORE_GBA Player(CoreController* controller, GBASIOLockstepNode* node); +#endif CoreController* controller; GBSIOLockstepNode* gbNode = nullptr;