diff --git a/YACReaderLibraryServer/headless_config.pri b/YACReaderLibraryServer/headless_config.pri index fd5601b8..ec21345e 100644 --- a/YACReaderLibraryServer/headless_config.pri +++ b/YACReaderLibraryServer/headless_config.pri @@ -16,17 +16,12 @@ lessThan(QT_VER_MIN, 3){ } !CONFIG(unarr):!CONFIG(7zip) { unix { - !macx { - CONFIG+=unarr - } - else { - CONFIG+=7zip - } - - } + CONFIG+=unarr + } + win32 { - CONFIG+=7zip - } + CONFIG+=7zip + } } unix { @@ -68,4 +63,4 @@ unix { message("Missing dependency: sqlite3") } } -} \ No newline at end of file +} diff --git a/compressed_archive/unarr/compressed_archive.cpp b/compressed_archive/unarr/compressed_archive.cpp index b7594986..98709cb0 100644 --- a/compressed_archive/unarr/compressed_archive.cpp +++ b/compressed_archive/unarr/compressed_archive.cpp @@ -6,7 +6,7 @@ #include "extract_delegate.h" extern"C" { -#include "unarr.h" +#include } CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) : diff --git a/compressed_archive/unarr/compressed_archive.h b/compressed_archive/unarr/compressed_archive.h index c0a99938..3aa4d3ab 100644 --- a/compressed_archive/unarr/compressed_archive.h +++ b/compressed_archive/unarr/compressed_archive.h @@ -4,7 +4,7 @@ #include #include "extract_delegate.h" extern"C" { -#include "unarr.h" +#include } class CompressedArchive : public QObject diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri index 2ba188c6..d5b29736 100644 --- a/compressed_archive/unarr/unarr-wrapper.pri +++ b/compressed_archive/unarr/unarr-wrapper.pri @@ -11,8 +11,10 @@ unix:!macx:exists (/usr/include/unarr.h) { LIBS+=-lunarr DEFINES+=use_unarr } -else:macx:exists (../../dependencies/unarr/libunarr.dynlib) { - LIBS += -L../../dependencies/unarr/ -lunarr +else:macx:exists (../../dependencies/unarr/libunarr.a) { + message(Found prebuilt unarr library.) + INCLUDEPATH += $$PWD/../../dependencies/unarr + LIBS += -L$$PWD/../../dependencies/unarr/ -lunarr -lz -lbz2 DEFINES+=use_unarr } @@ -33,4 +35,4 @@ else:exists ($$PWD/unarr-master) { else { error(Missing dependency: unarr decrompression backend. Please install libunarr on your system\ or provide a copy of the unarr source code in compressed_archive/unarr/unarr-master) - } \ No newline at end of file + } diff --git a/config.pri b/config.pri index 0d4733bd..f1f771cb 100644 --- a/config.pri +++ b/config.pri @@ -26,15 +26,9 @@ CONFIG(no_opengl) { !CONFIG(unarr):!CONFIG(7zip) { unix { - !macx { - CONFIG+=unarr - } - else { - CONFIG+=7zip - } - - } + CONFIG+=unarr + } win32 { CONFIG+=7zip } -} \ No newline at end of file +}