games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Fix mxe build

Browse Source
This commit is contained in:
nordsoft
2022-11-13 05:22:19 +04:00
parent a45fb910af
commit b2b9cacac2
2 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
launcher/main.cpp
View File

@@ -21,17 +21,16 @@
#if __has_include("QIOSIntegrationPlugin.h")
#include "QIOSIntegrationPlugin.h"
#endif
int argcForClient;
char ** argvForClient;
#endif
int __argc;
char ** __argv;
int main(int argc, char * argv[])
{
int result;
#ifdef VCMI_IOS
__argc = argc;
__argv = argv;
argcForClient = argc;
argvForClient = argv;
{
#endif
QApplication vcmilauncher(argc, argv);
@@ -48,18 +47,18 @@ int main(int argc, char * argv[])
void startGame(const QStringList & args)
{
__argc = args.size() + 1; //first argument is omitted
__argv = new char*[__argc];
__argv[0] = new char[strlen("vcmi")];
strcpy(__argv[0], "vcmi");
for(int i = 1; i < __argc; ++i)
logGlobal->warn("Starting game with the arguments: %s", args.join(" ").toStdString());
#ifdef Q_OS_IOS
argcForClient = args.size() + 1; //first argument is omitted
argvForClient = new char*[argcForClient];
argvForClient[0] = "vcmiclient";
for(int i = 1; i < argcForClient; ++i)
{
const char * s = args[i - 1].toLocal8Bit().constData();
__argv[i] = new char[strlen(s)];
strcpy(__argv[i], s);
argvForClient[i] = new char[strlen(s)];
strcpy(argvForClient[i], s);
}
#ifdef Q_OS_IOS
logGlobal->warn("Starting game with the arguments: %s", args.join(" ").toStdString());
qApp->quit();
#else
startExecutable(pathToQString(VCMIDirs::get().clientPath()), args);

4
launcher/main.h
View File

@@ -8,12 +8,12 @@
*
*/
#pragma once
extern int __argc;
extern char ** __argv;
void startGame(const QStringList & args);
#ifdef VCMI_IOS
extern int argcForClient;
extern char** argvForClient;
extern "C" void launchGame(int argc, char * argv[]);
#else
void startExecutable(QString name, const QStringList & args);