mirror of
https://github.com/YACReader/yacreader
synced 2025-07-14 02:54:46 -04:00
Build and install 7z.so, loading Codecs/Rar.so is broken
Also use multistage builds to have smaller images
This commit is contained in:
@ -129,22 +129,8 @@ QLibrary *YACReader::load7zLibrary()
|
||||
auto yacreader7zPath = QString(LIBDIR) + "/yacreader/7z.so";
|
||||
QFileInfo sevenzlibrary(yacreader7zPath);
|
||||
if (sevenzlibrary.exists()) {
|
||||
auto rarPath = QString(LIBDIR) + "/yacreader/Codecs/Rar.so";
|
||||
QFileInfo rarCodec(rarPath);
|
||||
if (rarCodec.exists()) {
|
||||
QLibrary *rarLibrary = new QLibrary(rarPath);
|
||||
rarLibrary->load();
|
||||
}
|
||||
|
||||
return new QLibrary(yacreader7zPath);
|
||||
} else {
|
||||
auto rarPath = QString(LIBDIR) + "/7zip/Codecs/Rar.so";
|
||||
QFileInfo rarCodec(rarPath);
|
||||
if (rarCodec.exists()) {
|
||||
QLibrary *rarLibrary = new QLibrary(rarPath);
|
||||
rarLibrary->load();
|
||||
}
|
||||
|
||||
return new QLibrary(QString(LIBDIR) + "/7zip/7z.so");
|
||||
}
|
||||
#else
|
||||
|
Reference in New Issue
Block a user