From 74fbe4b994116393aef2a0c6d6d9f40f91215c09 Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Tue, 23 May 2017 00:48:34 +0200
Subject: [PATCH] Fix Windows build for pdfium and poppler

---
 dependencies/pdf_backend.pri | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dependencies/pdf_backend.pri b/dependencies/pdf_backend.pri
index b05c022b..dd6620d7 100644
--- a/dependencies/pdf_backend.pri
+++ b/dependencies/pdf_backend.pri
@@ -6,7 +6,7 @@ CONFIG(pdfium) {
 	DEFINES += "USE_PDFIUM"
 	SOURCES += ../common/pdf_comic.cpp
 	win32 {
-		INCLUDEPATH += ../dependencies/pdfium/win/public
+                INCLUDEPATH += $$PWD/pdfium/win/public
 		contains(QMAKE_TARGET.arch, x86_64): {
 			LIBS += -L$$PWD/pdfium/win/x64 -lpdfium
 		} else {
@@ -36,8 +36,15 @@ CONFIG(pdfkit) {
 				
 CONFIG(poppler) {
 	win32 {
-		LIBS += -Lpoppler/lib -lpoppler-qt5
-		INCLUDEPATH += poppler/include/qt5
+                contains(QMAKE_TARGET.arch, x86_64): {
+                    error ("We currently don't ship precompiled poppler libraries for 64 bit builds")
+                }
+                INCLUDEPATH += $$PWD/poppler/include/qt5
+                LIBS += -L$$PWD/poppler/lib -lpoppler-qt5
+                #Add extra paths for dll dependencies so the executables don't crash when launching
+                #from QtCreator
+                LIBS += -L$$PWD/poppler/bin
+                LIBS += -L$$PWD/poppler/dependencies/bin
 	}
 	unix:!macx {
 		INCLUDEPATH  += /usr/include/poppler/qt5