diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-01-22 02:20:09 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-01-22 02:20:09 +0100 |
commit | c46c508fc6d168e6595e3624cfaa1fde0f495b90 (patch) | |
tree | c7baa5409199876061e5dafcf51f46cd6a93ded0 /logic | |
parent | b182f12c2076505c31b96eb7e8a8869fbadecd2d (diff) | |
download | MultiMC-c46c508fc6d168e6595e3624cfaa1fde0f495b90.tar MultiMC-c46c508fc6d168e6595e3624cfaa1fde0f495b90.tar.gz MultiMC-c46c508fc6d168e6595e3624cfaa1fde0f495b90.tar.lz MultiMC-c46c508fc6d168e6595e3624cfaa1fde0f495b90.tar.xz MultiMC-c46c508fc6d168e6595e3624cfaa1fde0f495b90.zip |
Extract native libs in the launcher part.
Diffstat (limited to 'logic')
-rw-r--r-- | logic/OneSixInstance.cpp | 5 | ||||
-rw-r--r-- | logic/OneSixUpdate.cpp | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 3cfc1c76..ab87a1db 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -228,6 +228,11 @@ MinecraftProcess *OneSixInstance::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/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index 0119ab07..ae647bfe 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -349,11 +349,6 @@ void OneSixUpdate::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 OneSixUpdate::prepareForLaunch() return; } } - +*/ emitSucceeded(); } |