summaryrefslogtreecommitdiffstats
path: root/logic/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-05 18:46:57 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-05 18:46:57 +0200
commit23d0bd8edde6aadfaa282215b5f143ad16210438 (patch)
treea14d3f47b51716fb784cb426eedd0a2e2d756b4f /logic/minecraft
parentcd108fd02975eac3a3fed2fde26c58de5cbdaf1c (diff)
downloadMultiMC-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/minecraft')
-rw-r--r--logic/minecraft/LegacyInstance.h4
-rw-r--r--logic/minecraft/LwjglVersionList.h6
-rw-r--r--logic/minecraft/MinecraftInstance.h4
-rw-r--r--logic/minecraft/MinecraftProfile.h5
-rw-r--r--logic/minecraft/MinecraftVersion.h4
-rw-r--r--logic/minecraft/MinecraftVersionList.h4
-rw-r--r--logic/minecraft/ModList.h4
-rw-r--r--logic/minecraft/OneSixInstance.cpp2
-rw-r--r--logic/minecraft/OneSixInstance.h4
-rw-r--r--logic/minecraft/SkinUtils.h4
-rw-r--r--logic/minecraft/VersionFilterData.h4
11 files changed, 33 insertions, 12 deletions
diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h
index 0930c290..8663daba 100644
--- a/logic/minecraft/LegacyInstance.h
+++ b/logic/minecraft/LegacyInstance.h
@@ -17,10 +17,12 @@
#include "minecraft/MinecraftInstance.h"
+#include "multimc_logic_export.h"
+
class ModList;
class Task;
-class LegacyInstance : public MinecraftInstance
+class MULTIMC_LOGIC_EXPORT LegacyInstance : public MinecraftInstance
{
Q_OBJECT
public:
diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/LwjglVersionList.h
index 9584f837..84abaab1 100644
--- a/logic/minecraft/LwjglVersionList.h
+++ b/logic/minecraft/LwjglVersionList.h
@@ -24,10 +24,12 @@
#include "BaseVersion.h"
#include "BaseVersionList.h"
+#include "multimc_logic_export.h"
+
class LWJGLVersion;
typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
-class LWJGLVersion : public BaseVersion
+class MULTIMC_LOGIC_EXPORT LWJGLVersion : public BaseVersion
{
public:
LWJGLVersion(const QString &name, const QString &url)
@@ -60,7 +62,7 @@ protected:
QString m_url;
};
-class LWJGLVersionList : public BaseVersionList
+class MULTIMC_LOGIC_EXPORT LWJGLVersionList : public BaseVersionList
{
Q_OBJECT
public:
diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h
index 39a51b9a..b3af2fe8 100644
--- a/logic/minecraft/MinecraftInstance.h
+++ b/logic/minecraft/MinecraftInstance.h
@@ -3,9 +3,11 @@
#include "minecraft/Mod.h"
#include <QProcess>
+#include "multimc_logic_export.h"
+
class ModList;
-class MinecraftInstance: public BaseInstance
+class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
{
public:
MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
diff --git a/logic/minecraft/MinecraftProfile.h b/logic/minecraft/MinecraftProfile.h
index d97f7bb8..6f56e848 100644
--- a/logic/minecraft/MinecraftProfile.h
+++ b/logic/minecraft/MinecraftProfile.h
@@ -25,10 +25,13 @@
#include "VersionFile.h"
#include "JarMod.h"
+#include "multimc_logic_export.h"
+
class ProfileStrategy;
class OneSixInstance;
-class MinecraftProfile : public QAbstractListModel
+
+class MULTIMC_LOGIC_EXPORT MinecraftProfile : public QAbstractListModel
{
Q_OBJECT
friend class ProfileStrategy;
diff --git a/logic/minecraft/MinecraftVersion.h b/logic/minecraft/MinecraftVersion.h
index 3795cb41..234e5566 100644
--- a/logic/minecraft/MinecraftVersion.h
+++ b/logic/minecraft/MinecraftVersion.h
@@ -24,11 +24,13 @@
#include "VersionFile.h"
#include "VersionSource.h"
+#include "multimc_logic_export.h"
+
class MinecraftProfile;
class MinecraftVersion;
typedef std::shared_ptr<MinecraftVersion> MinecraftVersionPtr;
-class MinecraftVersion : public BaseVersion, public ProfilePatch
+class MULTIMC_LOGIC_EXPORT MinecraftVersion : public BaseVersion, public ProfilePatch
{
public: /* methods */
bool usesLegacyLauncher();
diff --git a/logic/minecraft/MinecraftVersionList.h b/logic/minecraft/MinecraftVersionList.h
index 8e45d35a..110f8a66 100644
--- a/logic/minecraft/MinecraftVersionList.h
+++ b/logic/minecraft/MinecraftVersionList.h
@@ -24,10 +24,12 @@
#include "minecraft/MinecraftVersion.h"
#include <net/NetJob.h>
+#include "multimc_logic_export.h"
+
class MCVListLoadTask;
class MCVListVersionUpdateTask;
-class MinecraftVersionList : public BaseVersionList
+class MULTIMC_LOGIC_EXPORT MinecraftVersionList : public BaseVersionList
{
Q_OBJECT
private:
diff --git a/logic/minecraft/ModList.h b/logic/minecraft/ModList.h
index 70eb5569..823854ed 100644
--- a/logic/minecraft/ModList.h
+++ b/logic/minecraft/ModList.h
@@ -22,6 +22,8 @@
#include "minecraft/Mod.h"
+#include "multimc_logic_export.h"
+
class LegacyInstance;
class BaseInstance;
class QFileSystemWatcher;
@@ -30,7 +32,7 @@ class QFileSystemWatcher;
* A legacy mod list.
* Backed by a folder.
*/
-class ModList : public QAbstractListModel
+class MULTIMC_LOGIC_EXPORT ModList : public QAbstractListModel
{
Q_OBJECT
public:
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 6cea55d2..57fa0a68 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -292,7 +292,7 @@ std::shared_ptr<Task> OneSixInstance::createJarModdingTask()
class JarModTask : public Task
{
public:
- explicit JarModTask(std::shared_ptr<OneSixInstance> inst) : m_inst(inst), Task(nullptr)
+ explicit JarModTask(std::shared_ptr<OneSixInstance> inst) : Task(nullptr), m_inst(inst)
{
}
virtual void executeTask()
diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h
index 42902366..963bd152 100644
--- a/logic/minecraft/OneSixInstance.h
+++ b/logic/minecraft/OneSixInstance.h
@@ -20,7 +20,9 @@
#include "minecraft/MinecraftProfile.h"
#include "minecraft/ModList.h"
-class OneSixInstance : public MinecraftInstance
+#include "multimc_logic_export.h"
+
+class MULTIMC_LOGIC_EXPORT OneSixInstance : public MinecraftInstance
{
Q_OBJECT
public:
diff --git a/logic/minecraft/SkinUtils.h b/logic/minecraft/SkinUtils.h
index bab9d45e..5584bf6c 100644
--- a/logic/minecraft/SkinUtils.h
+++ b/logic/minecraft/SkinUtils.h
@@ -17,7 +17,9 @@
#include <QPixmap>
+#include "multimc_logic_export.h"
+
namespace SkinUtils
{
-QPixmap getFaceFromCache(QString username, int height = 64, int width = 64);
+QPixmap MULTIMC_LOGIC_EXPORT getFaceFromCache(QString username, int height = 64, int width = 64);
}
diff --git a/logic/minecraft/VersionFilterData.h b/logic/minecraft/VersionFilterData.h
index 339e3891..98db2484 100644
--- a/logic/minecraft/VersionFilterData.h
+++ b/logic/minecraft/VersionFilterData.h
@@ -4,6 +4,8 @@
#include <QSet>
#include <QDateTime>
+#include "multimc_logic_export.h"
+
struct FMLlib
{
QString filename;
@@ -29,4 +31,4 @@ struct VersionFilterData
// Currently discouraged java version (anything equal and above will be discouraged)
QString discouragedJavaVersion;
};
-extern VersionFilterData g_VersionFilterData;
+extern VersionFilterData MULTIMC_LOGIC_EXPORT g_VersionFilterData;