mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unarr: use static lib for mac builds.

Browse Source
This commit is contained in:
Felix Kauselmann 2017-04-10 20:17:17 +02:00
parent 7f6a248fe2
commit 7ac9860e60
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
YACReaderLibraryServer/headless_config.pri
View File

@ -16,17 +16,12 @@ lessThan(QT_VER_MIN, 3){
} }
!CONFIG(unarr):!CONFIG(7zip) { !CONFIG(unarr):!CONFIG(7zip) {
unix { unix {
!macx { CONFIG+=unarr
CONFIG+=unarr }
}
else {
CONFIG+=7zip
}
}
win32 { win32 {
CONFIG+=7zip CONFIG+=7zip
} }
} }
unix { unix {
@ -68,4 +63,4 @@ unix {
message("Missing dependency: sqlite3") message("Missing dependency: sqlite3")
} }
} }
} }

2
compressed_archive/unarr/compressed_archive.cpp
View File

@ -6,7 +6,7 @@
#include "extract_delegate.h" #include "extract_delegate.h"
extern"C" { extern"C" {
#include "unarr.h" #include <unarr.h>
} }
CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) : CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :

2
compressed_archive/unarr/compressed_archive.h
View File

@ -4,7 +4,7 @@
#include <QObject> #include <QObject>
#include "extract_delegate.h" #include "extract_delegate.h"
extern"C" { extern"C" {
#include "unarr.h" #include <unarr.h>
} }
class CompressedArchive : public QObject class CompressedArchive : public QObject

8
compressed_archive/unarr/unarr-wrapper.pri
View File

@ -11,8 +11,10 @@ unix:!macx:exists (/usr/include/unarr.h) {
LIBS+=-lunarr LIBS+=-lunarr
DEFINES+=use_unarr DEFINES+=use_unarr
} }
else:macx:exists (../../dependencies/unarr/libunarr.dynlib) { else:macx:exists (../../dependencies/unarr/libunarr.a) {
LIBS += -L../../dependencies/unarr/ -lunarr message(Found prebuilt unarr library.)
INCLUDEPATH += $$PWD/../../dependencies/unarr
LIBS += -L$$PWD/../../dependencies/unarr/ -lunarr -lz -lbz2
DEFINES+=use_unarr DEFINES+=use_unarr
} }
@ -33,4 +35,4 @@ else:exists ($$PWD/unarr-master) {
else { else {
error(Missing dependency: unarr decrompression backend. Please install libunarr on your system\ 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) or provide a copy of the unarr source code in compressed_archive/unarr/unarr-master)
} }

12
config.pri
View File

@ -26,15 +26,9 @@ CONFIG(no_opengl) {
!CONFIG(unarr):!CONFIG(7zip) { !CONFIG(unarr):!CONFIG(7zip) {
unix { unix {
!macx { CONFIG+=unarr
CONFIG+=unarr }
}
else {
CONFIG+=7zip
}
}
win32 { win32 {
CONFIG+=7zip CONFIG+=7zip
} }
} }