Cosmetic changes to make pdf flags look nicer in the .pro files

This commit is contained in:
Felix Kauselmann 2016-11-23 22:09:34 +01:00
parent 9b726f719b
commit cea9933cc2
3 changed files with 58 additions and 64 deletions

View File

@ -48,11 +48,11 @@ 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) { !CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
@ -75,10 +75,9 @@ unix:!macx{
-lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \
-lfxedit -Wl,--end-group -lfreetype -lfxedit -Wl,--end-group -lfreetype
} }
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
LIBS += -lGLU LIBS += -lGLU
@ -99,10 +98,9 @@ macx{
#TODO: pdfium support #TODO: pdfium support
!CONFIG(no_pdf) { !CONFIG(no_pdf) {
DEFINES += "USE_PDFKIT" DEFINES += "USE_PDFKIT"
} } else {
else { DEFINES += "NO_PDF"
DEFINES += "NO_PDF"
} }
CONFIG += objective_c CONFIG += objective_c

View File

@ -36,14 +36,15 @@ 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
} }
#TODO: pdfium for windows support
!CONFIG(no_pdf) { !CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} } else {
else {
DEFINES += "NO_PDF" 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
@ -63,8 +64,7 @@ unix:!macx{
-lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \
-lfxedit -Wl,--end-group -lfreetype -lfxedit -Wl,--end-group -lfreetype
} }
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
@ -88,10 +88,9 @@ macx{
!CONFIG(no_pdf){ !CONFIG(no_pdf){
#TODO:support for pdfium on mac #TODO:support for pdfium on mac
DEFINES += "USE_PDFKIT" DEFINES += "USE_PDFKIT"
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit LIBS += -framework Foundation -framework ApplicationServices -framework AppKit

View File

@ -22,8 +22,7 @@ win32 {
!CONFIG(no_pdf) { !CONFIG(no_pdf) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
@ -46,8 +45,7 @@ unix:!macx{
-lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \
-lfxedit -Wl,--end-group -lfreetype -lfxedit -Wl,--end-group -lfreetype
} }
} } else {
else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"
} }
} }
@ -55,10 +53,9 @@ macx{
#TODO:support for pdfium on mac #TODO:support for pdfium on mac
!CONFIG(no_pdf) { !CONFIG(no_pdf) {
DEFINES += "USE_PDFKIT" DEFINES += "USE_PDFKIT"
} } else {
else { DEFINES += "NO_PDF"
DEFINES += "NO_PDF"
} }
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit LIBS += -framework Foundation -framework ApplicationServices -framework AppKit