From 10b6f72e4a19e9c4ab43a7ef2843145eca712bd7 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Sat, 22 Apr 2017 13:58:47 +0200 Subject: [PATCH] Fix the include paths for prebuilt pdfium --- compileOSX.sh | 2 +- config.pri | 4 ++-- dependencies/pdf_backend.pri | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compileOSX.sh b/compileOSX.sh index 722ae794..2c68cde3 100755 --- a/compileOSX.sh +++ b/compileOSX.sh @@ -51,6 +51,6 @@ cp README.txt "${dest}/" echo "Creating dmg package" #tar -czf "${dest}".tar.gz "${dest}" #hdiutil create "${dest}".dmg -srcfolder "./${dest}" -ov -dependencies/create-dmg/create-dmg --volname 'YACReader '$VERSION' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "${dest}.dmg" "${dest}" +./dependencies/create-dmg/create-dmg --volname "YACReader $VERSION Installer" --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "$dest.dmg" "$dest" echo "Done!" diff --git a/config.pri b/config.pri index b7bce121..57156670 100644 --- a/config.pri +++ b/config.pri @@ -42,5 +42,5 @@ unix:!macx:!CONFIG(poppler):!CONFIG(pdfium) { } macx:!CONFIG(pdfkit):!CONFIG(pdfium) { - CONFIG += pdfkit -} \ No newline at end of file + CONFIG += pdfium +} diff --git a/dependencies/pdf_backend.pri b/dependencies/pdf_backend.pri index a6a9215a..b05c022b 100644 --- a/dependencies/pdf_backend.pri +++ b/dependencies/pdf_backend.pri @@ -8,15 +8,15 @@ CONFIG(pdfium) { win32 { INCLUDEPATH += ../dependencies/pdfium/win/public contains(QMAKE_TARGET.arch, x86_64): { - LIBS += -L$$PWD/../dependencies/pdfium/win/x64 -lpdfium + LIBS += -L$$PWD/pdfium/win/x64 -lpdfium } else { - LIBS += -L$$PWD/../dependencies/pdfium/win/x86 -lpdfium + LIBS += -L$$PWD/pdfium/win/x86 -lpdfium } } unix { macx { - LIBS += -L$$PWD/../dependencies/pdfium/macx/bin -lpdfium - INCLUDEPATH += $$PWD/../dependencies/pdfium/macx/public + LIBS += -L$$PWD/pdfium/macx/bin -lpdfium + INCLUDEPATH += $$PWD/pdfium/macx/include } !macx { INCLUDEPATH += /usr/include/pdfium