diff --git a/src/src.pro b/src/src.pro index c7e3d73b..2c4d8f2d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -299,38 +299,49 @@ RESOURCES += \ vnote.qrc \ translations.qrc -OTHER_FILES += \ - utils/highlightjs/highlight.pack.js \ - utils/markdown-it/markdown-it-headinganchor.js \ - utils/markdown-it/markdown-it-task-lists.min.js \ - utils/markdown-it/markdown-it.min.js \ - utils/marked/marked.min.js \ - utils/mermaid/mermaidAPI.min.js - macx { LIBS += -L/usr/local/lib INCLUDEPATH += /usr/local/include } -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../hoedown/release/ -lhoedown -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../hoedown/debug/ -lhoedown -else:unix: LIBS += -L$$OUT_PWD/../hoedown/ -lhoedown +INCLUDEPATH += $$PWD/../peg-highlight +DEPENDPATH += $$PWD/../peg-highlight INCLUDEPATH += $$PWD/../hoedown DEPENDPATH += $$PWD/../hoedown -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../peg-highlight/release/ -lpeg-highlight -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../peg-highlight/debug/ -lpeg-highlight -else:unix: LIBS += -L$$OUT_PWD/../peg-highlight/ -lpeg-highlight +win32-g++:CONFIG(release, debug|release) { + LIBS += $$OUT_PWD/../peg-highlight/release/libpeg-highlight.a + LIBS += $$OUT_PWD/../hoedown/release/libhoedown.a -INCLUDEPATH += $$PWD/../peg-highlight -DEPENDPATH += $$PWD/../peg-highlight + # Explicitly listing dependent static libraries. + PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/release/libpeg-highlight.a + PRE_TARGETDEPS += $$OUT_PWD/../hoedown/release/libhoedown.a +} else:win32-g++:CONFIG(debug, debug|release) { + LIBS += $$OUT_PWD/../peg-highlight/debug/libpeg-highlight.a + LIBS += $$OUT_PWD/../hoedown/debug/libhoedown.a -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/release/libpeg-highlight.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/debug/libpeg-highlight.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/release/peg-highlight.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/debug/peg-highlight.lib -else:unix: PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/libpeg-highlight.a + PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/debug/libpeg-highlight.a + PRE_TARGETDEPS += $$OUT_PWD/../hoedown/debug/libhoedown.a +} else:win32:!win32-g++:CONFIG(release, debug|release) { + LIBS += $$OUT_PWD/../peg-highlight/release/peg-highlight.lib + LIBS += $$OUT_PWD/../hoedown/release/hoedown.lib + + PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/release/peg-highlight.lib + PRE_TARGETDEPS += $$OUT_PWD/../hoedown/release/hoedown.lib +} else:win32:!win32-g++:CONFIG(debug, debug|release) { + LIBS += $$OUT_PWD/../peg-highlight/debug/peg-highlight.lib + LIBS += $$OUT_PWD/../hoedown/debug/hoedown.lib + + PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/debug/peg-highlight.lib + PRE_TARGETDEPS += $$OUT_PWD/../hoedown/debug/hoedown.lib +} else:unix { + LIBS += $$OUT_PWD/../peg-highlight/libpeg-highlight.a + LIBS += $$OUT_PWD/../hoedown/libhoedown.a + + PRE_TARGETDEPS += $$OUT_PWD/../peg-highlight/libpeg-highlight.a + PRE_TARGETDEPS += $$OUT_PWD/../hoedown/libhoedown.a +} ## INSTALLS unix:!macx {