From fe4a2cdcc86a7333fe92f8ab89ddd666d6ca63fe Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 11 Nov 2016 23:09:42 +0800 Subject: [PATCH] move peg-markdown-highlight as a lib to avoid warnings Signed-off-by: Le Tan --- VNote.pro | 3 ++- peg-highlight/peg-highlight.pro | 18 ++++++++++++++++++ .../pmh_definitions.h | 0 .../pmh_parser.c | 0 .../pmh_parser.h | 0 .../pmh_styleparser.c | 0 .../pmh_styleparser.h | 0 .../styles/error.style | 0 .../styles/fontsizes.style | 0 .../styles/macoslineseparator.style | 0 .../styles/playground.style | 0 .../styles/solarized-dark.style | 0 .../styles/solarized-light.style | 0 .../styles/teststyle.style | 0 .../styles/winlineseparator.style | 0 .../stylesheet_syntax.md | 0 src/hgmarkdownhighlighter.h | 2 +- src/src.pro | 18 +++++++++++++----- src/vstyleparser.h | 4 ++-- 19 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 peg-highlight/peg-highlight.pro rename {src/utils/peg-highlight => peg-highlight}/pmh_definitions.h (100%) rename {src/utils/peg-highlight => peg-highlight}/pmh_parser.c (100%) rename {src/utils/peg-highlight => peg-highlight}/pmh_parser.h (100%) rename {src/utils/peg-highlight => peg-highlight}/pmh_styleparser.c (100%) rename {src/utils/peg-highlight => peg-highlight}/pmh_styleparser.h (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/error.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/fontsizes.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/macoslineseparator.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/playground.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/solarized-dark.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/solarized-light.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/teststyle.style (100%) rename {src/utils/peg-highlight => peg-highlight}/styles/winlineseparator.style (100%) rename {src/utils/peg-highlight => peg-highlight}/stylesheet_syntax.md (100%) diff --git a/VNote.pro b/VNote.pro index 075b81ec..4adc516d 100644 --- a/VNote.pro +++ b/VNote.pro @@ -9,6 +9,7 @@ TEMPLATE = subdirs CONFIG += c++11 SUBDIRS = hoedown \ + peg-highlight \ src -src.depends = hoedown +src.depends = hoedown peg-highlight diff --git a/peg-highlight/peg-highlight.pro b/peg-highlight/peg-highlight.pro new file mode 100644 index 00000000..a7672ba4 --- /dev/null +++ b/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 diff --git a/src/utils/peg-highlight/pmh_definitions.h b/peg-highlight/pmh_definitions.h similarity index 100% rename from src/utils/peg-highlight/pmh_definitions.h rename to peg-highlight/pmh_definitions.h diff --git a/src/utils/peg-highlight/pmh_parser.c b/peg-highlight/pmh_parser.c similarity index 100% rename from src/utils/peg-highlight/pmh_parser.c rename to peg-highlight/pmh_parser.c diff --git a/src/utils/peg-highlight/pmh_parser.h b/peg-highlight/pmh_parser.h similarity index 100% rename from src/utils/peg-highlight/pmh_parser.h rename to peg-highlight/pmh_parser.h diff --git a/src/utils/peg-highlight/pmh_styleparser.c b/peg-highlight/pmh_styleparser.c similarity index 100% rename from src/utils/peg-highlight/pmh_styleparser.c rename to peg-highlight/pmh_styleparser.c diff --git a/src/utils/peg-highlight/pmh_styleparser.h b/peg-highlight/pmh_styleparser.h similarity index 100% rename from src/utils/peg-highlight/pmh_styleparser.h rename to peg-highlight/pmh_styleparser.h diff --git a/src/utils/peg-highlight/styles/error.style b/peg-highlight/styles/error.style similarity index 100% rename from src/utils/peg-highlight/styles/error.style rename to peg-highlight/styles/error.style diff --git a/src/utils/peg-highlight/styles/fontsizes.style b/peg-highlight/styles/fontsizes.style similarity index 100% rename from src/utils/peg-highlight/styles/fontsizes.style rename to peg-highlight/styles/fontsizes.style diff --git a/src/utils/peg-highlight/styles/macoslineseparator.style b/peg-highlight/styles/macoslineseparator.style similarity index 100% rename from src/utils/peg-highlight/styles/macoslineseparator.style rename to peg-highlight/styles/macoslineseparator.style diff --git a/src/utils/peg-highlight/styles/playground.style b/peg-highlight/styles/playground.style similarity index 100% rename from src/utils/peg-highlight/styles/playground.style rename to peg-highlight/styles/playground.style diff --git a/src/utils/peg-highlight/styles/solarized-dark.style b/peg-highlight/styles/solarized-dark.style similarity index 100% rename from src/utils/peg-highlight/styles/solarized-dark.style rename to peg-highlight/styles/solarized-dark.style diff --git a/src/utils/peg-highlight/styles/solarized-light.style b/peg-highlight/styles/solarized-light.style similarity index 100% rename from src/utils/peg-highlight/styles/solarized-light.style rename to peg-highlight/styles/solarized-light.style diff --git a/src/utils/peg-highlight/styles/teststyle.style b/peg-highlight/styles/teststyle.style similarity index 100% rename from src/utils/peg-highlight/styles/teststyle.style rename to peg-highlight/styles/teststyle.style diff --git a/src/utils/peg-highlight/styles/winlineseparator.style b/peg-highlight/styles/winlineseparator.style similarity index 100% rename from src/utils/peg-highlight/styles/winlineseparator.style rename to peg-highlight/styles/winlineseparator.style diff --git a/src/utils/peg-highlight/stylesheet_syntax.md b/peg-highlight/stylesheet_syntax.md similarity index 100% rename from src/utils/peg-highlight/stylesheet_syntax.md rename to peg-highlight/stylesheet_syntax.md diff --git a/src/hgmarkdownhighlighter.h b/src/hgmarkdownhighlighter.h index 89522c37..f9f4388e 100644 --- a/src/hgmarkdownhighlighter.h +++ b/src/hgmarkdownhighlighter.h @@ -15,7 +15,7 @@ #include extern "C" { -#include "utils/peg-highlight/pmh_parser.h" +#include } QT_BEGIN_NAMESPACE diff --git a/src/src.pro b/src/src.pro index 397e419e..b2f3c755 100644 --- a/src/src.pro +++ b/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 diff --git a/src/vstyleparser.h b/src/vstyleparser.h index 6938a168..bd05aab3 100644 --- a/src/vstyleparser.h +++ b/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 +#include } class QColor;