diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-01-22 14:06:58 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-01-22 14:06:58 +0100 |
| commit | d166b4807223ec7cd0df6f26e05a2f364dc6121c (patch) | |
| tree | 3bae4f2fc7b8f24923c57158fffb541568ece1a0 /logic | |
| parent | 13ac46bc185e861f9772f85adf757890dbb80a57 (diff) | |
| parent | c46c508fc6d168e6595e3624cfaa1fde0f495b90 (diff) | |
| download | MultiMC-d166b4807223ec7cd0df6f26e05a2f364dc6121c.tar MultiMC-d166b4807223ec7cd0df6f26e05a2f364dc6121c.tar.gz MultiMC-d166b4807223ec7cd0df6f26e05a2f364dc6121c.tar.lz MultiMC-d166b4807223ec7cd0df6f26e05a2f364dc6121c.tar.xz MultiMC-d166b4807223ec7cd0df6f26e05a2f364dc6121c.zip | |
Merge branch 'develop' into feature_derpstances
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/DerpInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/DerpUpdate.cpp | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/logic/DerpInstance.cpp b/logic/DerpInstance.cpp index 440c90a4..672ba6c4 100644 --- a/logic/DerpInstance.cpp +++ b/logic/DerpInstance.cpp @@ -226,6 +226,11 @@ MinecraftProcess *DerpInstance::prepareForLaunch(MojangAccountPtr account) } QDir natives_dir(PathCombine(instanceRoot(), "natives/")); launchScript += "windowTitle " + windowTitle() + "\n"; + for(auto native: version->getActiveNativeLibs()) + { + QFileInfo finfo(PathCombine("libraries", native->storagePath())); + launchScript += "ext " + finfo.absoluteFilePath() + "\n"; + } launchScript += "natives " + natives_dir.absolutePath() + "\n"; launchScript += "launch onesix\n"; diff --git a/logic/DerpUpdate.cpp b/logic/DerpUpdate.cpp index e1600d28..5686e4ac 100644 --- a/logic/DerpUpdate.cpp +++ b/logic/DerpUpdate.cpp @@ -349,11 +349,6 @@ void DerpUpdate::prepareForLaunch() return; } /* - * emitFailed("Could not create the native library folder:\n" + natives_dir_raw + - "\nMake sure MultiMC has appropriate permissions and there is enough - space " - "on the storage device."); - */ for (auto lib : version->getActiveNativeLibs()) { if (!lib->filesExist()) @@ -372,6 +367,6 @@ void DerpUpdate::prepareForLaunch() return; } } - +*/ emitSucceeded(); } |