浏览代码

Remove some ios specific flags

nordsoft 2 年之前
父节点
当前提交
3d60f079fb
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 1 2
      launcher/main.h
  2. 1 4
      launcher/mainwindow_moc.cpp

+ 1 - 2
launcher/main.h

@@ -8,9 +8,8 @@
  *
  *
  */
  */
 #pragma once
 #pragma once
-#ifdef VCMI_IOS
 extern int __argc;
 extern int __argc;
 extern char ** __argv;
 extern char ** __argv;
-
+#ifdef VCMI_IOS
 extern "C" void launchGame(int argc, char * argv[]);
 extern "C" void launchGame(int argc, char * argv[]);
 #endif
 #endif

+ 1 - 4
launcher/mainwindow_moc.cpp

@@ -22,10 +22,8 @@
 #include "updatedialog_moc.h"
 #include "updatedialog_moc.h"
 #include "main.h"
 #include "main.h"
 
 
-#ifdef VCMI_IOS
 int __argc;
 int __argc;
 char ** __argv;
 char ** __argv;
-#endif
 
 
 void MainWindow::load()
 void MainWindow::load()
 {
 {
@@ -120,7 +118,6 @@ MainWindow::~MainWindow()
 
 
 void MainWindow::startGame(const QStringList & args)
 void MainWindow::startGame(const QStringList & args)
 {
 {
-#ifdef Q_OS_IOS
 	__argc = args.size() + 1; //first argument is omitted
 	__argc = args.size() + 1; //first argument is omitted
 	__argv = new char*[__argc];
 	__argv = new char*[__argc];
 	__argv[0] = "vcmiclient";
 	__argv[0] = "vcmiclient";
@@ -130,7 +127,7 @@ void MainWindow::startGame(const QStringList & args)
 		__argv[i] = new char[strlen(s)];
 		__argv[i] = new char[strlen(s)];
 		strcpy(__argv[i], s);
 		strcpy(__argv[i], s);
 	}
 	}
-	
+#ifdef Q_OS_IOS
 	logGlobal->warn("Starting game with the arguments: %s", args.join(" ").toStdString());
 	logGlobal->warn("Starting game with the arguments: %s", args.join(" ").toStdString());
 	qApp->quit();
 	qApp->quit();
 #else
 #else