Buildsystem: add folders for 64bit build and improve dependencies detection.

This commit is contained in:
Felix Kauselmann
2017-10-21 21:49:00 +02:00
parent a1b37eb9cb
commit af59672204
4 changed files with 461 additions and 461 deletions

View File

@ -1,6 +1,3 @@
# #####################################################################
# Automatically generated by qmake (2.01a) mié 8. oct 20:54:05 2008
# #####################################################################
TEMPLATE = app
TARGET = YACReader
@ -21,12 +18,22 @@ unix:!macx{
}
CONFIG(force_angle) {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64_angle
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
}
SOURCES += main.cpp
@ -62,24 +69,12 @@ unix:!macx:!CONFIG(no_opengl) {
}
macx {
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
#INCLUDEPATH += /usr/local/include/poppler/qt5
#LIBS += -L/usr/local/lib -lpoppler-qt5
#}
#else {
#INCLUDEPATH += /usr/local/include/poppler/qt4
#LIBS += -L/usr/local/lib -lpoppler-qt4
#}
CONFIG += objective_c
QT += macextras gui-private
CONFIG += objective_c
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
}
QT += network widgets core
QT += network widgets core multimedia
!CONFIG(no_opengl) {
QT += opengl
}
@ -87,9 +82,7 @@ QT += network widgets core
#CONFIG += release
CONFIG -= flat
QT += multimedia
# Input
# Sources
HEADERS += ../common/comic.h \
configuration.h \
goto_dialog.h \
@ -127,7 +120,7 @@ HEADERS += ../common/comic.h \
!CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) {
message("using legacy YACReaderFlowGL (QGLWidget) header")
message("Using legacy YACReaderFlowGL (QGLWidget) header")
DEFINES += YACREADER_LEGACY_FLOW_GL
HEADERS += ../common/gl_legacy/yacreader_flow_gl.h
} else {
@ -197,7 +190,6 @@ win32:RESOURCES += yacreader_images_win.qrc
unix:!macx:RESOURCES += yacreader_images_win.qrc
macx:RESOURCES += yacreader_images_osx.qrc
include(../QsLog/QsLog.pri)
RC_FILE = icon.rc

View File

@ -1,15 +1,11 @@
######################################################################
# Automatically generated by qmake (2.01a) dom 12. oct 20:47:48 2008
######################################################################
TEMPLATE = app
TARGET = YACReaderLibrary
QMAKE_TARGET_BUNDLE_PREFIX = "com.yacreader"
DEPENDPATH += .
INCLUDEPATH += .
INCLUDEPATH += ../common \
INCLUDEPATH += . \
../common \
./server \
./db \
../custom_widgets \
@ -18,6 +14,7 @@ INCLUDEPATH += ../common \
DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY
QMAKE_MAC_SDK = macosx10.12
# load default build flags
include (../config.pri)
include (../dependencies/pdf_backend.pri)
@ -28,7 +25,7 @@ CONFIG(legacy_gl_widget) {
INCLUDEPATH += ../common/gl \
}
#there are going to be two builds for windows, OpenGL based and ANGLE based
# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based
win32 {
CONFIG(force_angle) {
message("using ANGLE")
@ -46,24 +43,29 @@ win32 {
CONFIG -= embed_manifest_exe
}
unix:!macx{
!CONFIG(no_opengl) {
LIBS += -lGLU
CONFIG(force_angle) {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64_angle
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
}
unix:!macx:!CONFIG(no_opengl) {
LIBS += -lGLU
}
macx {
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
#INCLUDEPATH += /usr/local/include/poppler/qt5
#LIBS += -L/usr/local/lib -lpoppler-qt5
#}
#else {
#INCLUDEPATH += /usr/local/include/poppler/qt4
#LIBS += -L/usr/local/lib -lpoppler-qt4
#}
#QT += macextras
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
@ -71,7 +73,7 @@ CONFIG += objective_c
QT += macextras gui-private
}
unix{
unix:!macx {
CONFIG += c++11
}
@ -234,6 +236,7 @@ SOURCES += comic_flow.cpp \
include(./server/server.pri)
include(../custom_widgets/custom_widgets_yacreaderlibrary.pri)
CONFIG(7zip){
include(../compressed_archive/wrapper.pri)
} else:CONFIG(unarr) {
@ -266,14 +269,6 @@ TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_de.ts \
yacreaderlibrary_source.ts
CONFIG(force_angle) {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
#QML/GridView
QT += quick qml
@ -318,7 +313,6 @@ icon.files = ../YACReaderLibrary.png
desktop.path = $$DATADIR/applications
desktop.files = ../YACReaderLibrary.desktop
#TODO: icons should be located at /usr/share/icons and have the same basename as their application
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*

View File

@ -2,16 +2,17 @@ INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
HEADERS += $$PWD/extract_delegate.h \
$$PWD/compressed_archive.h \
$$PWD/compressed_archive.h
SOURCES += $$PWD/compressed_archive.cpp \
SOURCES += $$PWD/compressed_archive.cpp
unix:!macx {
unix:!macx:packagesExist(libunarr) {
message(Using system provided unarr installation)
CONFIG += link_pkgconfig
PKGCONFIG += libunarr
DEFINES += use_unarr
}
else:macx:exists(../../dependencies/unarr/macx/libunarr.a) {
message(Found prebuilt unarr library in dependencies directory.)
INCLUDEPATH += $$PWD/../../dependencies/unarr/macx
@ -39,6 +40,7 @@ else:exists ($$PWD/unarr-master) {
include(unarr.pro)
DEFINES += use_unarr
}
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)

View File

@ -18,9 +18,16 @@ CONFIG(pdfium) {
LIBS += -L$$PWD/pdfium/macx/bin -lpdfium
INCLUDEPATH += $$PWD/pdfium/macx/include
}
!macx {
!macx:packagesExist(libpdfium) {
message(Using system provided installation of libpdfium.)
CONFIG += link_pkgconfig
PKGCONFIG += libpdfium
} else:!macx:exists(/usr/include/pdfium):exists(/usr/lib/libpdfium.so) {
message(Using libpdfium found at /usr/lib/pdfium)
INCLUDEPATH += /usr/include/pdfium
LIBS += -L/usr/lib/pdfium -lpdfium -lfreetype
LIBS += -L/usr/lib/pdfium -lpdfium
} else {
error(Could not find libpdfium.)
}
}
}
@ -37,7 +44,7 @@ CONFIG(pdfkit) {
CONFIG(poppler) {
win32 {
contains(QMAKE_TARGET.arch, x86_64): {
error ("We currently don't ship precompiled poppler libraries for 64 bit builds")
error ("We currently don't ship precompiled poppler libraries for 64 bit builds on Windows")
}
INCLUDEPATH += $$PWD/poppler/include/qt5
LIBS += -L$$PWD/poppler/lib -lpoppler-qt5
@ -47,9 +54,14 @@ CONFIG(poppler) {
LIBS += -L$$PWD/poppler/dependencies/bin
}
unix:!macx {
packagesExist(poppler-qt5) {
CONFIG += link_pkgconfig
PKGCONFIG += poppler-qt5
} else {
INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5
}
}
unix:macx {
error (Poppler backend is currently not supported on macOS)
}