Map editor can be built during single-app build

Editor remains as separate .exe in such build, but it won't break
compilation

mapeditor/CMakeLists.txt

@@ -116,7 +116,7 @@ if(APPLE)
 	set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER vcmieditor)
 endif()
 
-target_link_libraries(vcmieditor vcmi Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
+target_link_libraries(vcmieditor ${VCMI_LIB_TARGET} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
 target_include_directories(vcmieditor
 	PUBLIC	${CMAKE_CURRENT_SOURCE_DIR}
 )

mapeditor/graphics.h

@@ -13,16 +13,21 @@
 #include "../lib/GameConstants.h"
 #include <QImage>
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class CGHeroInstance;
 class CGTownInstance;
+class CGObjectInstance;
+class EntityService;
+class JsonNode;
+class ObjectTemplate;
+
+VCMI_LIB_NAMESPACE_END
+
 class CHeroClass;
 struct InfoAboutHero;
 struct InfoAboutTown;
-class CGObjectInstance;
-class ObjectTemplate;
 class Animation;
-class EntityService;
-class JsonNode;
 
 /// Handles fonts, hero images, town images, various graphics
 class Graphics

mapeditor/jsonutils.cpp

@@ -51,6 +51,8 @@ static JsonMap VariantToMap(QVariantMap variant)
 	return map;
 }
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 namespace JsonUtils
 {
 
@@ -123,3 +125,5 @@ void JsonToFile(QString filename, QVariant object)
 }
 
 }
+
+VCMI_LIB_NAMESPACE_END

mapeditor/jsonutils.h

@@ -12,6 +12,8 @@
 #include <QVariant>
 #include "../lib/JsonNode.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 namespace JsonUtils
 {
 QVariant toVariant(const JsonNode & node);
@@ -20,3 +22,5 @@ QVariant JsonFromFile(QString filename);
 JsonNode toJson(QVariant object);
 void JsonToFile(QString filename, QVariant object);
 }
+
+VCMI_LIB_NAMESPACE_END

mapeditor/mainwindow.h

@@ -7,9 +7,12 @@
 #include "../lib/Terrain.h"
 #include "resourceExtractor/ResourceConverter.h"
 
-class CMap;
 class ObjectBrowser;
+
+VCMI_LIB_NAMESPACE_BEGIN
+class CMap;
 class CGObjectInstance;
+VCMI_LIB_NAMESPACE_END
 
 namespace Ui
 {

mapeditor/maphandler.h

@@ -19,10 +19,14 @@
 #include <QPixmap>
 #include <QRect>
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class CGObjectInstance;
 class CGBoat;
 class PlayerColor;
 
+VCMI_LIB_NAMESPACE_END
+
 struct TileObject
 {
 	CGObjectInstance *obj;

mapeditor/mapview.h

@@ -16,7 +16,10 @@
 #include "../lib/int3.h"
 
 
+VCMI_LIB_NAMESPACE_BEGIN
 class CGObjectInstance;
+VCMI_LIB_NAMESPACE_END
+
 class MainWindow;
 class MapController;
 

mapeditor/scenelayer.h

@@ -14,11 +14,15 @@
 
 class MapSceneBase;
 class MapScene;
-class CGObjectInstance;
 class MapController;
-class CMap;
 class MapHandler;
 
+VCMI_LIB_NAMESPACE_BEGIN
+class CMap;
+class CGObjectInstance;
+VCMI_LIB_NAMESPACE_END
+
+
 class AbstractLayer : public QObject
 {
 	Q_OBJECT