mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-08-06 22:35:30 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Felix Kauselmann
2015-02-24 19:04:21 +01:00
parent 445f725ee2
commit 4b078a9f15
5 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compressed_archive/compressed_archive.cpp
View File

@ -2,6 +2,7 @@
#include "extract_delegate.h"
#include <QLibrary>
#include <QFileInfo>
#include <QDebug>
#include <QApplication>
@ -201,7 +202,16 @@ bool CompressedArchive::loadFunctions()
#if defined Q_OS_MAC
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29");
#else
rarLib = new QLibrary(QString(LIBDIR)+"/p7zip/Codecs/Rar29.so");
//check if a yacreader specific version of p7zip exists on the system
QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");
if (rarCodec.exists())
{
rarLib = new QLibrary(rarCodec.absoluteFilePath());
}
else
{
rarLib = new QLibrary(QString(LIBDIR)+"/p7zip/Codecs/Rar29.so");
}
#endif
if(!rarLib->load())
{
@ -211,7 +221,15 @@ bool CompressedArchive::loadFunctions()
}
#endif
#if defined Q_OS_UNIX && !defined Q_OS_MAC
sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
QFileInfo sevenzlibrary(QString(LIBDIR)+"/yacreader/7z.so");
if (sevenzlibrary.exists())
{
sevenzLib = new QLibrary(sevenzlibrary.absoluteFilePath());
}
else
{
sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
}
#else
sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z");
#endif