diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index c64090ad..9999d305 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -54,8 +54,8 @@ win32 { INCLUDEPATH += ../dependencies/poppler/include/qt5 } else { DEFINES += "USE_PDFIUM" - LIBS += -L../dependencies/pdfium/x86 -lpdfium - INCLUDEPATH += ../dependencies/pdfium/public + LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium + INCLUDEPATH += $$PWD../dependencies/pdfium/public } } else { DEFINES += "NO_PDF" @@ -208,6 +208,10 @@ SOURCES += ../common/comic.cpp \ ../common/scroll_management.cpp \ ../common/opengl_checker.cpp +CONFIG(pdfium) { + SOURCES+= ../common/pdf_comic.cpp + } + !CONFIG(no_opengl) { CONFIG(legacy_gl_widget) { message("using legacy YACReaderFlowGL (QGLWidget) source code") diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 03913dab..3fd3c5e4 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -44,8 +44,8 @@ win32 { INCLUDEPATH += ../dependencies/poppler/include/qt5 } else { DEFINES += "USE_PDFIUM" - LIBS += -L../dependencies/pdfium/x86 -lpdfium - INCLUDEPATH += ../dependencies/pdfium/public + LIBS += -L$$PWD../dependencies/pdfium/x86 -lpdfium + INCLUDEPATH += $$PWD../dependencies/pdfium/public } } else { DEFINES += "NO_PDF" @@ -233,7 +233,6 @@ SOURCES += comic_flow.cpp \ ../common/yacreader_global_gui.cpp \ yacreader_libraries.cpp \ ../common/exit_check.cpp \ - ../common/pdf_comic.cpp \ comics_view.cpp \ classic_comics_view.cpp \ empty_folder_widget.cpp \ @@ -257,6 +256,11 @@ SOURCES += comic_flow.cpp \ yacreader_comics_selection_helper.cpp \ yacreader_comic_info_helper.cpp +CONFIG(pdfium) { + SOURCES += ../common/pdf_comic.cpp + } + + !CONFIG(no_opengl) { CONFIG(legacy_gl_widget) { message("using legacy YACReaderFlowGL (QGLWidget) source code") diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index bb5b22e0..dab24bd8 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -20,8 +20,14 @@ include(headless_config.pri) win32 { LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -luser32 !CONFIG(no_pdf) { - LIBS += -lpoppler-qt5 - INCLUDEPATH += ../dependencies/poppler/include/qt5 + !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 + } } else { DEFINES += "NO_PDF" } @@ -103,7 +109,6 @@ SOURCES += ../YACReaderLibrary/library_creator.cpp \ ../common/folder.cpp \ ../common/library_item.cpp \ ../common/comic.cpp \ - ../common/pdf_comic.cpp \ ../common/bookmarks.cpp \ ../common/qnaturalsorting.cpp \ ../YACReaderLibrary/yacreader_local_server.cpp \ @@ -115,6 +120,9 @@ SOURCES += ../YACReaderLibrary/library_creator.cpp \ console_ui_library_creator.cpp \ main.cpp +CONFIG(pdfium) { + SOURCES += ../common/pdf_comic.cpp + } include(../YACReaderLibrary/server/server.pri)