fix building launcher

configure_ios.sh

@@ -2,7 +2,7 @@
 
 platform=OS64
 globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphoneos
-qtDir=~/dev/Qt-libs/5.15.2/ios
+qtDir=~/dev/Qt-libs/5.15.5/ios10-widgets
 if [[ "$1" ]]; then
 	platform=SIMULATOR64
 	globalPrefix=~/dev/vcmi/vcmi-ios-depends/build/iphonesimulator
@@ -24,7 +24,7 @@ cmake "$srcDir" -G Xcode \
   -DBUNDLE_IDENTIFIER_PREFIX=com.kambala \
   -Wno-dev \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-  -DCMAKE_TOOLCHAIN_FILE="$srcDir/ios.toolchain.cmake" \
+  --toolchain "$srcDir/ios.toolchain.cmake" \
   -DPLATFORM=$platform \
   -DDEPLOYMENT_TARGET=12.0 \
   -DENABLE_BITCODE=OFF \

launcher/CMakeLists.txt

@@ -123,7 +123,12 @@ if(APPLE_IOS)
 	set_source_files_properties(ios/Images.xcassets PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
-target_link_libraries(vcmilauncher vcmi Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
+if(BUILD_SINGLE_APP)
+	set(VCMI_LIB_TARGET vcmi_lib_client)
+else()
+	set(VCMI_LIB_TARGET vcmi)
+endif()
+target_link_libraries(vcmilauncher ${VCMI_LIB_TARGET} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
 target_include_directories(vcmilauncher
 	PUBLIC	${CMAKE_CURRENT_SOURCE_DIR}
 )

launcher/StdInc.h

@@ -10,6 +10,8 @@
 #include <QString>
 #include <QFile>
 
+VCMI_LIB_USING_NAMESPACE
+
 inline QString pathToQString(const boost::filesystem::path & path)
 {
 #ifdef VCMI_WINDOWS

launcher/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

launcher/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

launcher/modManager/cmodlist.h

@@ -13,8 +13,12 @@
 #include <QVariant>
 #include <QVector>
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class JsonNode;
 
+VCMI_LIB_NAMESPACE_END
+
 namespace ModStatus
 {
 enum EModStatus