Merge pull request #1005 from kambala-decapitator/ios-min-12

raise iOS deployment target to 12.0

CMakeLists.txt

@@ -171,7 +171,7 @@ endif()
 
 if(APPLE_IOS)
 	set(CMAKE_MACOSX_RPATH 1)
-	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.0)
+	set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
 
 	list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_PREFIX_PATH}") # required for Boost
 	set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH FALSE)

client/CMT.cpp

@@ -104,7 +104,9 @@ static po::variables_map vm;
 
 //static bool setResolution = false; //set by event handling thread after resolution is adjusted
 
+#ifndef VCMI_IOS
 void processCommand(const std::string &message);
+#endif
 static void setScreenRes(int w, int h, int bpp, bool fullscreen, int displayIndex, bool resetVideo=true);
 void playIntro();
 static void mainLoop();
@@ -236,9 +238,11 @@ int main(int argc, char * argv[])
 	// Init old logging system and new (temporary) logging system
 	CStopWatch total, pomtime;
 	std::cout.flags(std::ios::unitbuf);
+#ifndef VCMI_IOS
 	console = new CConsoleHandler();
 	*console->cb = processCommand;
 	console->start();
+#endif
 
 	const bfs::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Client_log.txt";
 	logConfig = new CBasicLogConfigurator(logPath, console);
@@ -553,6 +557,7 @@ void removeGUI()
 	LOCPLINT = nullptr;
 }
 
+#ifndef VCMI_IOS
 void processCommand(const std::string &message)
 {
 	std::istringstream readed;
@@ -965,6 +970,7 @@ void processCommand(const std::string &message)
 		LOCPLINT->cb->sendMessage(message);
 	}*/
 }
+#endif
 
 //plays intro, ends when intro is over or button has been pressed (handles events)
 void playIntro()
@@ -975,6 +981,7 @@ void playIntro()
 	}
 }
 
+#ifndef VCMI_IOS
 static bool checkVideoMode(int monitorIndex, int w, int h)
 {
 	//we only check that our desired window size fits on screen
@@ -996,6 +1003,7 @@ static bool checkVideoMode(int monitorIndex, int w, int h)
 
 	return false;
 }
+#endif
 
 static void cleanupRenderer()
 {

client/CPlayerInterface.cpp

@@ -84,8 +84,6 @@
 
 using namespace CSDL_Ext;
 
-void processCommand(const std::string &message, CClient *&client);
-
 extern std::queue<SDL_Event> SDLEventsQueue;
 extern boost::mutex eventsM;
 boost::recursive_mutex * CPlayerInterface::pim = new boost::recursive_mutex;

launcher/mainwindow_moc.cpp

@@ -27,7 +27,9 @@ void MainWindow::load()
 	// This is important on Mac for relative paths to work inside DMG.
 	QDir::setCurrent(QApplication::applicationDirPath());
 
+#ifndef VCMI_IOS
 	console = new CConsoleHandler();
+#endif
 	CBasicLogConfigurator logConfig(VCMIDirs::get().userLogsPath() / "VCMI_Launcher_log.txt", console);
 	logConfig.configureDefault();
 

lib/logging/CLogger.cpp

@@ -346,7 +346,11 @@ EConsoleTextColor::EConsoleTextColor CColorMapping::getColorFor(const CLoggerDom
 	throw std::runtime_error("failed to find color for requested domain/level pair");
 }
 
-CLogConsoleTarget::CLogConsoleTarget(CConsoleHandler * console) : console(console), threshold(ELogLevel::INFO), coloredOutputEnabled(true)
+CLogConsoleTarget::CLogConsoleTarget(CConsoleHandler * console) :
+#ifndef VCMI_IOS
+    console(console),
+#endif
+    threshold(ELogLevel::INFO), coloredOutputEnabled(true)
 {
 	formatter.setPattern("%m");
 }

lib/logging/CLogger.h

@@ -198,7 +198,9 @@ public:
 	void write(const LogRecord & record) override;
 
 private:
+#ifndef VCMI_IOS
 	CConsoleHandler * console;
+#endif
 	ELogLevel::ELogLevel threshold;
 	bool coloredOutputEnabled;
 	CLogFormatter formatter;

server/CVCMIServer.cpp

@@ -935,7 +935,9 @@ int main(int argc, char * argv[])
 	signal(SIGSEGV, handleLinuxSignal);
 #endif
 
+#ifndef VCMI_IOS
 	console = new CConsoleHandler();
+#endif
 	CBasicLogConfigurator logConfig(VCMIDirs::get().userLogsPath() / "VCMI_Server_log.txt", console);
 	logConfig.configureDefault();
 	logGlobal->info(SERVER_NAME);