瀏覽代碼

move peg-markdown-highlight as a lib to avoid warnings

Signed-off-by: Le Tan <[email protected]>
Le Tan 9 年之前
父節點
當前提交
fe4a2cdcc8

+ 2 - 1
VNote.pro

@@ -9,6 +9,7 @@ TEMPLATE = subdirs
 CONFIG += c++11
 
 SUBDIRS = hoedown \
+    peg-highlight \
     src
 
-src.depends = hoedown
+src.depends = hoedown peg-highlight

+ 18 - 0
peg-highlight/peg-highlight.pro

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

+ 0 - 0
src/utils/peg-highlight/pmh_definitions.h → peg-highlight/pmh_definitions.h


+ 0 - 0
src/utils/peg-highlight/pmh_parser.c → peg-highlight/pmh_parser.c


+ 0 - 0
src/utils/peg-highlight/pmh_parser.h → peg-highlight/pmh_parser.h


+ 0 - 0
src/utils/peg-highlight/pmh_styleparser.c → peg-highlight/pmh_styleparser.c


+ 0 - 0
src/utils/peg-highlight/pmh_styleparser.h → peg-highlight/pmh_styleparser.h


+ 0 - 0
src/utils/peg-highlight/styles/error.style → peg-highlight/styles/error.style


+ 0 - 0
src/utils/peg-highlight/styles/fontsizes.style → peg-highlight/styles/fontsizes.style


+ 0 - 0
src/utils/peg-highlight/styles/macoslineseparator.style → peg-highlight/styles/macoslineseparator.style


+ 0 - 0
src/utils/peg-highlight/styles/playground.style → peg-highlight/styles/playground.style


+ 0 - 0
src/utils/peg-highlight/styles/solarized-dark.style → peg-highlight/styles/solarized-dark.style


+ 0 - 0
src/utils/peg-highlight/styles/solarized-light.style → peg-highlight/styles/solarized-light.style


+ 0 - 0
src/utils/peg-highlight/styles/teststyle.style → peg-highlight/styles/teststyle.style


+ 0 - 0
src/utils/peg-highlight/styles/winlineseparator.style → peg-highlight/styles/winlineseparator.style


+ 0 - 0
src/utils/peg-highlight/stylesheet_syntax.md → peg-highlight/stylesheet_syntax.md


+ 1 - 1
src/hgmarkdownhighlighter.h

@@ -15,7 +15,7 @@
 #include <QAtomicInt>
 
 extern "C" {
-#include "utils/peg-highlight/pmh_parser.h"
+#include <pmh_parser.h>
 }
 
 QT_BEGIN_NAMESPACE

+ 13 - 5
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

+ 2 - 2
src/vstyleparser.h

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