diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-05 18:46:57 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-05 18:46:57 +0200 |
| commit | 23d0bd8edde6aadfaa282215b5f143ad16210438 (patch) | |
| tree | a14d3f47b51716fb784cb426eedd0a2e2d756b4f /logic/launch | |
| parent | cd108fd02975eac3a3fed2fde26c58de5cbdaf1c (diff) | |
| download | MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.gz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.lz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.tar.xz MultiMC-23d0bd8edde6aadfaa282215b5f143ad16210438.zip | |
NOISSUE make shared logic library ... shared
Diffstat (limited to 'logic/launch')
| -rw-r--r-- | logic/launch/LaunchTask.h | 4 | ||||
| -rw-r--r-- | logic/launch/steps/CheckJava.cpp | 1 | ||||
| -rw-r--r-- | logic/launch/steps/LaunchMinecraft.cpp | 2 | ||||
| -rw-r--r-- | logic/launch/steps/TextPrint.h | 8 |
4 files changed, 11 insertions, 4 deletions
diff --git a/logic/launch/LaunchTask.h b/logic/launch/LaunchTask.h index bd0485c8..eb13a72d 100644 --- a/logic/launch/LaunchTask.h +++ b/logic/launch/LaunchTask.h @@ -22,7 +22,9 @@ #include "LoggedProcess.h" #include "LaunchStep.h" -class LaunchTask: public Task +#include "multimc_logic_export.h" + +class MULTIMC_LOGIC_EXPORT LaunchTask: public Task { Q_OBJECT protected: diff --git a/logic/launch/steps/CheckJava.cpp b/logic/launch/steps/CheckJava.cpp index 92c65d0a..9c5fd404 100644 --- a/logic/launch/steps/CheckJava.cpp +++ b/logic/launch/steps/CheckJava.cpp @@ -57,7 +57,6 @@ void CheckJava::executeTask() if (javaUnixTime != storedUnixTime) { m_JavaChecker = std::make_shared<JavaChecker>(); - bool successful = false; QString errorLog; QString version; emit logLine(tr("Checking Java version..."), MessageLevel::MultiMC); diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp index 4cde2d9f..95438003 100644 --- a/logic/launch/steps/LaunchMinecraft.cpp +++ b/logic/launch/steps/LaunchMinecraft.cpp @@ -81,8 +81,8 @@ void LaunchMinecraft::on_state(LoggedProcess::State state) case LoggedProcess::Finished: { m_parent->setPid(-1); - auto exitCode = m_process.exitCode(); //FIXME: make this work again + // auto exitCode = m_process.exitCode(); // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode)); // run post-exit emitSucceeded(); diff --git a/logic/launch/steps/TextPrint.h b/logic/launch/steps/TextPrint.h index 3846bf84..fdd9014a 100644 --- a/logic/launch/steps/TextPrint.h +++ b/logic/launch/steps/TextPrint.h @@ -19,7 +19,13 @@ #include <launch/LoggedProcess.h> #include <java/JavaChecker.h> -class TextPrint: public LaunchStep +#include "multimc_logic_export.h" + +/* + * FIXME: maybe do not export + */ + +class MULTIMC_LOGIC_EXPORT TextPrint: public LaunchStep { Q_OBJECT public: |