diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 9999d305..248a266e 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -54,8 +54,12 @@ win32 { INCLUDEPATH += ../dependencies/poppler/include/qt5 } else { DEFINES += "USE_PDFIUM" - LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium - INCLUDEPATH += $$PWD../dependencies/pdfium/public + contains(QMAKE_TARGET.arch, x86_64): { + LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium + } else { + LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium + } + INCLUDEPATH += ../dependencies/pdfium/public } } else { DEFINES += "NO_PDF" diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 3fd3c5e4..ff3ceff6 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -37,15 +37,18 @@ win32 { LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32 } - #TODO: pdfium for windows support !CONFIG(no_pdf) { !CONFIG(pdfium) { LIBS += -lpoppler-qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5 } else { DEFINES += "USE_PDFIUM" - LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium - INCLUDEPATH += $$PWD../dependencies/pdfium/public + contains(QMAKE_TARGET.arch, x86_64): { + LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium + } else { + LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium + } + INCLUDEPATH += ../dependencies/pdfium/public } } else { DEFINES += "NO_PDF" diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index dab24bd8..78d9ad58 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -25,8 +25,12 @@ win32 { INCLUDEPATH += ../dependencies/poppler/include/qt5 } else { DEFINES += "USE_PDFIUM" - LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium - INCLUDEPATH += $$PWD../dependencies/pdfium/public + contains(QMAKE_TARGET.arch, x86_64): { + LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium + } else { + LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium + } + INCLUDEPATH += ../dependencies/pdfium/public } } else { DEFINES += "NO_PDF" diff --git a/dependencies/pdfium/x64/pdfium.dll b/dependencies/pdfium/x64/pdfium.dll index 49a353ff..005b03fb 100644 Binary files a/dependencies/pdfium/x64/pdfium.dll and b/dependencies/pdfium/x64/pdfium.dll differ diff --git a/dependencies/pdfium/x64/pdfium.lib b/dependencies/pdfium/x64/pdfium.lib index 576cc804..49e8c538 100644 Binary files a/dependencies/pdfium/x64/pdfium.lib and b/dependencies/pdfium/x64/pdfium.lib differ