OS compatibility and generic cleanup.
Removed bspatch/patchlib Now builds and runs on Windows
This commit is contained in:
@ -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))
|
||||
{
|
||||
|
@ -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);
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
Reference in New Issue
Block a user