From 372531083c6b660f41bfc40f4bc74e42906233df Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Fri, 10 Mar 2017 10:08:30 +0100 Subject: [PATCH] Use dynamic pdfium library for linux builds. Keep static library parameters as comments for potential later usage. --- YACReader/YACReader.pro | 12 +++++++----- YACReaderLibrary/YACReaderLibrary.pro | 12 +++++++----- YACReaderLibraryServer/YACReaderLibraryServer.pro | 11 +++++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 248a266e..7c1d16e2 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -76,13 +76,15 @@ unix:!macx{ INCLUDEPATH += /usr/include/poppler/qt5 LIBS += -L/usr/lib -lpoppler-qt5 } else { - #static pdfium libraries have to be included *before* dynamic libraries DEFINES += "USE_PDFIUM" INCLUDEPATH += /usr/include/pdfium - LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ - -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ - -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ - -lfxedit -Wl,--end-group -lfreetype + LIBS += -L/usr/lib/pdfium -lpdfium -lfreetype + + #static pdfium libraries have to be included *before* dynamic libraries + #LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ + # -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ + # -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ + # -lfxedit -Wl,--end-group -lfreetype } } else { DEFINES += "NO_PDF" diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index ff3ceff6..669cfd95 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -65,13 +65,15 @@ unix:!macx{ INCLUDEPATH += /usr/include/poppler/qt5 LIBS += -L/usr/lib -lpoppler-qt5 } else { - #static pdfium libraries have to be included *before* dynamic libraries DEFINES += "USE_PDFIUM" INCLUDEPATH += /usr/include/pdfium - LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ - -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ - -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ - -lfxedit -Wl,--end-group -lfreetype + LIBS += -L/usr/lib/pdfium -lfreetype + + #static pdfium libraries have to be included *before* dynamic libraries + #LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ + # -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ + # -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ + # -lfxedit -Wl,--end-group -lfreetype } } else { DEFINES += "NO_PDF" diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index 78d9ad58..ecc4c7b0 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -50,10 +50,13 @@ unix:!macx{ #static pdfium libraries have to be included *before* dynamic libraries DEFINES += "USE_PDFIUM" INCLUDEPATH += /usr/include/pdfium - LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ - -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ - -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ - -lfxedit -Wl,--end-group -lfreetype + LIBS += -L/usr/lib/pdfium -lfreetype + + #static pdfium libraries have to be included *before* dynamic libraries + #LIBS += -L/usr/lib/pdfium -Wl,--start-group -lpdfium -lfpdfapi -lfxge -lfpdfdoc \ + # -lfxcrt -lfx_agg -lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -ljpeg \ + # -lfx_zlib -lfdrm -lfxedit -lformfiller -lpdfwindow -lpdfium -lbigint -ljavascript \ + # -lfxedit -Wl,--end-group -lfreetype } } else { DEFINES += "NO_PDF"