add 64bit build support for pdfium on windows

This commit is contained in:
Felix Kauselmann 2017-02-14 12:09:27 +01:00
parent e0ccb3bf50
commit 625b0967e5
5 changed files with 18 additions and 7 deletions

View File

@ -54,8 +54,12 @@ win32 {
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} else { } else {
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium contains(QMAKE_TARGET.arch, x86_64): {
INCLUDEPATH += $$PWD../dependencies/pdfium/public LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium
} else {
LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium
}
INCLUDEPATH += ../dependencies/pdfium/public
} }
} else { } else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"

View File

@ -37,15 +37,18 @@ win32 {
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) {
!CONFIG(pdfium) { !CONFIG(pdfium) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} else { } else {
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium contains(QMAKE_TARGET.arch, x86_64): {
INCLUDEPATH += $$PWD../dependencies/pdfium/public LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium
} else {
LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium
}
INCLUDEPATH += ../dependencies/pdfium/public
} }
} else { } else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"

View File

@ -25,8 +25,12 @@ win32 {
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} else { } else {
DEFINES += "USE_PDFIUM" DEFINES += "USE_PDFIUM"
LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium contains(QMAKE_TARGET.arch, x86_64): {
INCLUDEPATH += $$PWD../dependencies/pdfium/public LIBS += -L$$PWD/../dependencies/pdfium/x64 -lpdfium
} else {
LIBS += -L$$PWD/../dependencies/pdfium/x86 -lpdfium
}
INCLUDEPATH += ../dependencies/pdfium/public
} }
} else { } else {
DEFINES += "NO_PDF" DEFINES += "NO_PDF"

Binary file not shown.

Binary file not shown.