mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
YACReader/YACReader.pro
View File

@ -48,13 +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) { !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" }
}
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
@ -62,23 +62,22 @@ win32 {
} }
unix:!macx{ unix:!macx{
!CONFIG(no_pdf){ !CONFIG(no_pdf){
!CONFIG(pdfium){ !CONFIG(pdfium){
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
} else { } else {
#static pdfium libraries have to be included *before* dynamic libraries #static pdfium libraries have to be included *before* dynamic libraries
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
INCLUDEPATH += /usr/include/pdfium INCLUDEPATH += /usr/include/pdfium
LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \
-lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \
-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

35
YACReaderLibrary/YACReaderLibrary.pro
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 {
DEFINES += "NO_PDF"
} }
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
@ -51,21 +52,20 @@ win32 {
unix:!macx{ unix:!macx{
!CONFIG(no_pdf){ !CONFIG(no_pdf){
!CONFIG(pdfium){ !CONFIG(pdfium){
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
} else { } else {
#static pdfium libraries have to be included *before* dynamic libraries #static pdfium libraries have to be included *before* dynamic libraries
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
INCLUDEPATH += /usr/include/pdfium INCLUDEPATH += /usr/include/pdfium
LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \
-lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \
-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) {
@ -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

39
YACReaderLibraryServer/YACReaderLibraryServer.pro
View File

@ -20,11 +20,10 @@ 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) { !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"
} }
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
@ -34,31 +33,29 @@ win32 {
unix:!macx{ unix:!macx{
!CONFIG(no_pdf){ !CONFIG(no_pdf){
!CONFIG(pdfium){ !CONFIG(pdfium){
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
} else { } else {
#static pdfium libraries have to be included *before* dynamic libraries #static pdfium libraries have to be included *before* dynamic libraries
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
INCLUDEPATH += /usr/include/pdfium INCLUDEPATH += /usr/include/pdfium
LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \
-lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \
-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"
} }
} }
macx{ 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