diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp index 650592f1da60..4e6bb54ec727 100644 --- a/Source/Core/Core/Config/MainSettings.cpp +++ b/Source/Core/Core/Config/MainSettings.cpp @@ -307,6 +307,7 @@ void SetIsoPaths(const std::vector& paths) // Main.GBA +#ifdef HAS_LIBMGBA const Info MAIN_GBA_BIOS_PATH{{System::Main, "GBA", "BIOS"}, ""}; const std::array, 4> MAIN_GBA_ROM_PATHS{ Info{{System::Main, "GBA", "Rom1"}, ""}, @@ -316,6 +317,7 @@ const std::array, 4> MAIN_GBA_ROM_PATHS{ const Info MAIN_GBA_SAVES_PATH{{System::Main, "GBA", "SavesPath"}, ""}; const Info MAIN_GBA_SAVES_IN_ROM_PATH{{System::Main, "GBA", "SavesInRomPath"}, false}; const Info MAIN_GBA_THREADS{{System::Main, "GBA", "Threads"}, true}; +#endif // Main.Network diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h index 8a2b8be500f9..c97a32e97a28 100644 --- a/Source/Core/Core/Config/MainSettings.h +++ b/Source/Core/Core/Config/MainSettings.h @@ -179,11 +179,13 @@ void SetIsoPaths(const std::vector& paths); // Main.GBA +#ifdef HAS_LIBMGBA extern const Info MAIN_GBA_BIOS_PATH; extern const std::array, 4> MAIN_GBA_ROM_PATHS; extern const Info MAIN_GBA_SAVES_PATH; extern const Info MAIN_GBA_SAVES_IN_ROM_PATH; extern const Info MAIN_GBA_THREADS; +#endif // Main.Network diff --git a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp index 92dd1a9cfca2..7e7d4f949d52 100644 --- a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp @@ -138,10 +138,12 @@ class NetPlayConfigLayerLoader final : public Config::ConfigLayerLoader layer->Set(Config::SESSION_GCI_FOLDER_CURRENT_GAME_ONLY, true); } +#ifdef HAS_LIBMGBA for (size_t i = 0; i < m_settings.m_GBARomPaths.size(); ++i) { layer->Set(Config::MAIN_GBA_ROM_PATHS[i], m_settings.m_GBARomPaths[i]); } +#endif // Check To Override Client's Cheat Codes if (m_settings.m_SyncCodes && !m_settings.m_IsHosting) diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index a5f072125139..1e6aa4bbb9c5 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -91,9 +91,11 @@ static void InitCustomPaths() CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH)); CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH)); File::SetUserPath(F_WIISDCARD_IDX, Config::Get(Config::MAIN_SD_PATH)); +#ifdef HAS_LIBMGBA File::SetUserPath(F_GBABIOS_IDX, Config::Get(Config::MAIN_GBA_BIOS_PATH)); File::SetUserPath(D_GBASAVES_IDX, Config::Get(Config::MAIN_GBA_SAVES_PATH)); File::CreateFullPath(File::GetUserPath(D_GBASAVES_IDX)); +#endif } void Init()