CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE make shared logic library ... shared

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-05 18:46:57 +02:00
parent cd108fd029
commit 23d0bd8edd
76 changed files with 259 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/minecraft/LegacyInstance.h
View File

@ -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:

6
logic/minecraft/LwjglVersionList.h
View File

@ -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:

4
logic/minecraft/MinecraftInstance.h
View File

@ -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);

5
logic/minecraft/MinecraftProfile.h
View File

@ -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;

4
logic/minecraft/MinecraftVersion.h
View File

@ -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();

4
logic/minecraft/MinecraftVersionList.h
View File

@ -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:

4
logic/minecraft/ModList.h
View File

@ -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:

2
logic/minecraft/OneSixInstance.cpp
View File

@ -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()

4
logic/minecraft/OneSixInstance.h
View File

@ -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:

4
logic/minecraft/SkinUtils.h
View File

@ -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);
}

4
logic/minecraft/VersionFilterData.h
View File

@ -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;