Fix the include paths for prebuilt pdfium

This commit is contained in:
Felix Kauselmann 2017-04-22 13:58:47 +02:00
parent d989e06c57
commit 10b6f72e4a
3 changed files with 7 additions and 7 deletions

View File

@ -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!"

View File

@ -42,5 +42,5 @@ unix:!macx:!CONFIG(poppler):!CONFIG(pdfium) {
}
macx:!CONFIG(pdfkit):!CONFIG(pdfium) {
CONFIG += pdfkit
}
CONFIG += pdfium
}

View File

@ -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