games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Added -DENABLED_LAUNCHER and -DENABLED_EDITOR defines

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-28 17:56:22 +02:00
parent 42ecf05c47
commit 858fb97f42
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -474,9 +474,11 @@ if(NOT TARGET minizip::minizip)
endif() endif()
if(ENABLE_LAUNCHER) if(ENABLE_LAUNCHER)
add_definitions(-DENABLE_LAUNCHER)
add_subdirectory(launcher) add_subdirectory(launcher)
endif() endif()
if(ENABLE_EDITOR) if(ENABLE_EDITOR)
add_definitions(-DENABLE_EDITOR)
add_subdirectory(mapeditor) add_subdirectory(mapeditor)
endif() endif()
add_subdirectory(client) add_subdirectory(client)

16
launcher/main.cpp
View File

@@ -63,14 +63,14 @@ void startGame(const QStringList & args)
startExecutable(pathToQString(VCMIDirs::get().clientPath()), args); startExecutable(pathToQString(VCMIDirs::get().clientPath()), args);
#endif #endif
} }
void startEditor(const QStringList & args) void startEditor(const QStringList & args)
{ {
#ifndef Q_OS_IOS #ifdef ENABLE_EDITOR
startExecutable(pathToQString(VCMIDirs::get().editorPath()), args); startExecutable(pathToQString(VCMIDirs::get().mapEditorPath()), args);
#endif #endif
} }
#ifndef Q_OS_IOS #ifndef Q_OS_IOS
void startExecutable(QString name, const QStringList & args) void startExecutable(QString name, const QStringList & args)
{ {

2
launcher/mainwindow_moc.cpp
View File

@@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget * parent)
move(position); move(position);
} }
#ifdef Q_OS_IOS #ifndef ENABLE_EDITOR
ui->startEditorButton->hide(); ui->startEditorButton->hide();
#endif #endif