Merge pull request #14054 from Dentomologist/libmgba_fix_build_when_disabled
libmgba: Fix build when disabled
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
// Copyright 2021 Dolphin Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
|
||||
#include "DolphinQt/GBAHost.h"
|
||||
|
||||
#include <QApplication>
|
||||
@@ -47,3 +49,4 @@ std::unique_ptr<GBAHostInterface> Host_CreateGBAHost(std::weak_ptr<HW::GBA::Core
|
||||
{
|
||||
return std::make_unique<GBAHost>(core);
|
||||
}
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "Core/Host.h"
|
||||
@@ -26,3 +28,4 @@ private:
|
||||
GBAWidgetController* m_widget_controller{};
|
||||
std::weak_ptr<HW::GBA::Core> m_core;
|
||||
};
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
// Copyright 2021 Dolphin Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
|
||||
#include "DolphinQt/GBAWidget.h"
|
||||
|
||||
#include <fmt/format.h>
|
||||
@@ -615,3 +617,4 @@ void GBAWidgetController::FrameEnded(std::span<const u32> video_buffer)
|
||||
{
|
||||
m_widget->SetVideoBuffer(video_buffer);
|
||||
}
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <span>
|
||||
@@ -112,3 +114,4 @@ public:
|
||||
private:
|
||||
GBAWidget* m_widget{};
|
||||
};
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
@@ -665,6 +665,8 @@ void GameCubePane::SetAGPRom(ExpansionInterface::Slot slot, const QString& filen
|
||||
LoadSettings();
|
||||
}
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
|
||||
void GameCubePane::BrowseGBABios()
|
||||
{
|
||||
QString file = QDir::toNativeSeparators(DolphinFileDialog::getOpenFileName(
|
||||
@@ -699,6 +701,8 @@ void GameCubePane::BrowseGBASaves()
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
void GameCubePane::LoadSettings()
|
||||
{
|
||||
bool have_menu = false;
|
||||
|
||||
@@ -50,10 +50,13 @@ private:
|
||||
bool SetGCIFolder(ExpansionInterface::Slot slot, const QString& path);
|
||||
void BrowseAGPRom(ExpansionInterface::Slot slot);
|
||||
void SetAGPRom(ExpansionInterface::Slot slot, const QString& filename);
|
||||
|
||||
#ifdef HAS_LIBMGBA
|
||||
void BrowseGBABios();
|
||||
void BrowseGBARom(size_t index);
|
||||
void SaveRomPathChanged();
|
||||
void BrowseGBASaves();
|
||||
#endif // HAS_LIBMGBA
|
||||
|
||||
ConfigBool* m_skip_main_menu;
|
||||
ConfigChoice* m_language_combo;
|
||||
|
||||
Reference in New Issue
Block a user