Add no_pdf config options to all builds

This commit is contained in:
Felix Kauselmann 2016-11-22 19:41:00 +01:00
parent 595ceecb62
commit 01218de82c
3 changed files with 37 additions and 9 deletions

View File

@ -48,9 +48,13 @@ win32 {
} else { } else {
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
} }
!CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
}
else {
DEFINES += "NO_PDF"
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG QMAKE_LFLAGS_RELEASE += /LTCG
@ -94,7 +98,12 @@ macx{
#} #}
#TODO: pdfium support #TODO: pdfium support
!CONFIG(no_pdf) {
DEFINES += "USE_PDFKIT" DEFINES += "USE_PDFKIT"
}
else {
DEFINES += "NO_PDF"
}
CONFIG += objective_c CONFIG += objective_c
QT += macextras gui-private QT += macextras gui-private

View File

@ -36,10 +36,14 @@ win32 {
} else { } else {
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
} }
!CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
}
else {
DEFINES += "NO_PDF"
}
#TODO: pdfium for windows support
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe CONFIG -= embed_manifest_exe
@ -81,8 +85,13 @@ macx{
#} #}
#QT += macextras #QT += macextras
#TODO:support for pdfium on mac !CONFIG(no_pdf){
DEFINES += "USE_PDFKIT" #TODO:support for pdfium on mac
DEFINES += "USE_PDFKIT"
}
else {
DEFINES += "NO_PDF"
}
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit LIBS += -framework Foundation -framework ApplicationServices -framework AppKit

View File

@ -19,8 +19,13 @@ include(headless_config.pri)
win32 { win32 {
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -luser32 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -luser32
!CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
}
else {
DEFINES += "NO_PDF
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG QMAKE_LFLAGS_RELEASE += /LTCG
@ -50,7 +55,12 @@ else {
macx{ macx{
#TODO:support for pdfium on mac #TODO:support for pdfium on mac
!CONFIG(no_pdf) {
DEFINES += "USE_PDFKIT" DEFINES += "USE_PDFKIT"
}
else {
DEFINES += "NO_PDF"
}
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit LIBS += -framework Foundation -framework ApplicationServices -framework AppKit