mirror of
https://gitee.com/vnotex/vnote.git
synced 2025-07-04 21:39:52 +08:00
move peg-markdown-highlight as a lib to avoid warnings
Signed-off-by: Le Tan <tamlokveer@gmail.com>
This commit is contained in:
parent
5f8073eeec
commit
fe4a2cdcc8
@ -9,6 +9,7 @@ TEMPLATE = subdirs
|
||||
CONFIG += c++11
|
||||
|
||||
SUBDIRS = hoedown \
|
||||
peg-highlight \
|
||||
src
|
||||
|
||||
src.depends = hoedown
|
||||
src.depends = hoedown peg-highlight
|
||||
|
18
peg-highlight/peg-highlight.pro
Normal file
18
peg-highlight/peg-highlight.pro
Normal file
@ -0,0 +1,18 @@
|
||||
# PEG-Markdown-Highlight
|
||||
# Github: https://github.com/ali-rantakari/peg-markdown-highlight
|
||||
|
||||
QT -= core gui
|
||||
|
||||
TARGET = peg-highlight
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
CONFIG += warn_off
|
||||
CONFIG += staticlib
|
||||
|
||||
SOURCES += pmh_parser.c \
|
||||
pmh_styleparser.c
|
||||
|
||||
HEADERS += pmh_parser.h \
|
||||
pmh_styleparser.h \
|
||||
pmh_definitions.h
|
@ -15,7 +15,7 @@
|
||||
#include <QAtomicInt>
|
||||
|
||||
extern "C" {
|
||||
#include "utils/peg-highlight/pmh_parser.h"
|
||||
#include <pmh_parser.h>
|
||||
}
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
18
src/src.pro
18
src/src.pro
@ -27,10 +27,8 @@ SOURCES += main.cpp\
|
||||
vdocument.cpp \
|
||||
utils/vutils.cpp \
|
||||
vpreviewpage.cpp \
|
||||
utils/peg-highlight/pmh_parser.c \
|
||||
hgmarkdownhighlighter.cpp \
|
||||
vstyleparser.cpp \
|
||||
utils/peg-highlight/pmh_styleparser.c \
|
||||
dialog/vnewnotebookdialog.cpp \
|
||||
vmarkdownconverter.cpp \
|
||||
dialog/vnotebookinfodialog.cpp \
|
||||
@ -60,11 +58,8 @@ HEADERS += vmainwindow.h \
|
||||
vdocument.h \
|
||||
utils/vutils.h \
|
||||
vpreviewpage.h \
|
||||
utils/peg-highlight/pmh_parser.h \
|
||||
hgmarkdownhighlighter.h \
|
||||
utils/peg-highlight/pmh_definitions.h \
|
||||
vstyleparser.h \
|
||||
utils/peg-highlight/pmh_styleparser.h \
|
||||
dialog/vnewnotebookdialog.h \
|
||||
vmarkdownconverter.h \
|
||||
dialog/vnotebookinfodialog.h \
|
||||
@ -89,3 +84,16 @@ else:unix: LIBS += -L$$OUT_PWD/../hoedown/ -lhoedown
|
||||
|
||||
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
|
||||
|
||||
INCLUDEPATH += $$PWD/../peg-highlight
|
||||
DEPENDPATH += $$PWD/../peg-highlight
|
||||
|
||||
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
|
||||
|
@ -7,8 +7,8 @@
|
||||
#include "hgmarkdownhighlighter.h"
|
||||
|
||||
extern "C" {
|
||||
#include "utils/peg-highlight/pmh_definitions.h"
|
||||
#include "utils/peg-highlight/pmh_styleparser.h"
|
||||
#include <pmh_definitions.h>
|
||||
#include <pmh_styleparser.h>
|
||||
}
|
||||
|
||||
class QColor;
|
||||
|
Loading…
x
Reference in New Issue
Block a user