From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 7 Sep 2017 21:51:06 +0000 (+0200)
Subject: main.cpp: server-only builds should not include client headers
X-Git-Tag: 5.0.0~849
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=151c95bb9bb324ef27df28bbd4f2bce944e35162;p=oweals%2Fminetest.git

main.cpp: server-only builds should not include client headers
---

diff --git a/src/main.cpp b/src/main.cpp
index e2f2b22cf..1a3c49658 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "irrlicht.h" // createDevice
-#include "mainmenumanager.h"
 #include "irrlichttypes_extrabloated.h"
 #include "chat_interface.h"
 #include "debug.h"
@@ -26,14 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "filesys.h"
 #include "version.h"
-#include "guiMainMenu.h"
 #include "game.h"
 #include "defaultsettings.h"
 #include "gettext.h"
 #include "log.h"
 #include "quicktune.h"
 #include "httpfetch.h"
-#include "guiEngine.h"
 #include "gameparams.h"
 #include "database.h"
 #include "config.h"
@@ -44,7 +41,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include "terminal_chat_console.h"
 #endif
 #ifndef SERVER
+#include "guiMainMenu.h"
 #include "client/clientlauncher.h"
+#include "guiEngine.h"
+#include "mainmenumanager.h"
 #endif
 
 #ifdef HAVE_TOUCHSCREENGUI