diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-26 02:53:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-26 02:53:29 +0200 |
| commit | 00742af3a6f6d25fbd3b3b77744e8f39a8c14c71 (patch) | |
| tree | 41631a8ec88cbe637f877f74115c961d61ebdea6 /logic | |
| parent | c5725d653bbe693148d1a34ddcd82f03fda5e8ff (diff) | |
| download | MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.gz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.lz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.xz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.zip | |
OS compatibility and generic cleanup.
Removed bspatch/patchlib
Now builds and runs on Windows
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/LegacyUpdate.cpp | 6 | ||||
| -rw-r--r-- | logic/OneSixInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/net/DownloadJob.h | 2 | ||||
| -rw-r--r-- | logic/net/JobQueue.h | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index 0dc8ee72..e259a674 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -161,10 +161,12 @@ void LegacyUpdate::extractLwjgl() { #ifdef Q_OS_WIN32 QString nativesDir = "windows"; -#elif Q_OS_MAC - QString nativesDir = "macosx"; #else + #ifdef Q_OS_MAC + QString nativesDir = "macosx"; + #else QString nativesDir = "linux"; + #endif #endif if (name.contains(nativesDir)) { diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 61002320..44af6707 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -123,8 +123,11 @@ MinecraftProcess* OneSixInstance::prepareForLaunch ( QString user, QString sessi { QFileInfo fi(QString("libraries/") + lib->storagePath()); classPath.append(fi.absoluteFilePath()); - //FIXME: make separator tweakable +#ifdef Q_OS_WIN32 + classPath.append(';'); +#else classPath.append(':'); +#endif } QString targetstr = "versions/" + version->id + "/" + version->id + ".jar"; QFileInfo fi(targetstr); diff --git a/logic/net/DownloadJob.h b/logic/net/DownloadJob.h index cbde3852..94abb9af 100644 --- a/logic/net/DownloadJob.h +++ b/logic/net/DownloadJob.h @@ -5,7 +5,7 @@ /** * A single file for the downloader/cache to process. */ -class LIBUTIL_EXPORT DownloadJob : public Job +class DownloadJob : public Job { Q_OBJECT public: diff --git a/logic/net/JobQueue.h b/logic/net/JobQueue.h index 26f49307..b6895f60 100644 --- a/logic/net/JobQueue.h +++ b/logic/net/JobQueue.h @@ -12,7 +12,7 @@ enum JobStatus class JobList; -class LIBUTIL_EXPORT Job : public QObject +class Job : public QObject { Q_OBJECT protected: @@ -31,7 +31,7 @@ typedef QSharedPointer<Job> JobPtr; /** * A list of jobs, to be processed one by one. */ -class LIBUTIL_EXPORT JobList : public QObject +class JobList : public QObject { friend class JobListQueue; Q_OBJECT @@ -128,7 +128,7 @@ typedef QSharedPointer<JobList> JobListPtr; /** * A queue of job lists! The job lists fail or finish as units. */ -class LIBUTIL_EXPORT JobListQueue : public QObject +class JobListQueue : public QObject { Q_OBJECT public: |