mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD(client): Fix compile errors without manual plugin

Browse Source 
When excluding the manual plugin from the build (-Dmanual-plugin=OFF),
the compilation would fail due to the ManualPlugin.h header being
included in certain files nonetheless.

As it turns out the include was superfluous in the PluginConfig.cpp
file and in PluginManager.cpp the include is now shielded by a proper
ifdef-guard.

Fixes #5304
This commit is contained in:
Robert Adam 2021-11-10 08:52:21 +01:00
parent 1fa6909d6e
commit d25bfd02fc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mumble/PluginConfig.cpp
View File

@ -7,7 +7,6 @@
#include "Log.h"
#include "MainWindow.h"
#include "ManualPlugin.h"
#include "Message.h"
#include "MumbleApplication.h"
#include "PluginInstaller.h"

5
src/mumble/PluginManager.cpp
View File

@ -22,13 +22,16 @@
#include "API.h"
#include "Log.h"
#include "ManualPlugin.h"
#include "PluginInstaller.h"
#include "PluginUpdater.h"
#include "ProcessResolver.h"
#include "ServerHandler.h"
#include "Global.h"
#ifdef USE_MANUAL_PLUGIN
# include "ManualPlugin.h"
#endif
#include <cstdint>
#include <memory>
#include <vector>