Browse Source

Global veriables

nordsoft 3 years ago
parent
commit
e83870205e
3 changed files with 6 additions and 2 deletions
  1. 2 2
      launcher/main.h
  2. 3 0
      launcher/mainwindow_moc.cpp
  3. 1 0
      launcher/mainwindow_moc.h

+ 2 - 2
launcher/main.h

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

+ 3 - 0
launcher/mainwindow_moc.cpp

@@ -22,6 +22,9 @@
 #include "updatedialog_moc.h"
 #include "main.h"
 
+int __argc;
+char ** __argv;
+
 void MainWindow::load()
 {
 	// Set current working dir to executable folder.

+ 1 - 0
launcher/mainwindow_moc.h

@@ -10,6 +10,7 @@
 #pragma once
 #include <QMainWindow>
 #include <QStringList>
+#include "main.h"
 
 namespace Ui
 {