From 23d0bd8edde6aadfaa282215b5f143ad16210438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 5 Sep 2015 18:46:57 +0200 Subject: NOISSUE make shared logic library ... shared --- logic/launch/LaunchTask.h | 4 +++- logic/launch/steps/CheckJava.cpp | 1 - logic/launch/steps/LaunchMinecraft.cpp | 2 +- logic/launch/steps/TextPrint.h | 8 +++++++- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'logic/launch') 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(); - 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 #include -class TextPrint: public LaunchStep +#include "multimc_logic_export.h" + +/* + * FIXME: maybe do not export + */ + +class MULTIMC_LOGIC_EXPORT TextPrint: public LaunchStep { Q_OBJECT public: -- cgit v1.2.3