From fb641c9e8167f061d24f01713f9d6cb2c16324b0 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 6 Sep 2016 18:29:28 +0200 Subject: [PATCH] build: move PEGTL to a Git submodule --- .gitmodules | 3 +++ build/autotools/m4/lol-conf.m4 | 2 +- build/msbuild/lol.vars.props | 4 ++-- src/3rdparty/pegtl | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) create mode 160000 src/3rdparty/pegtl diff --git a/.gitmodules b/.gitmodules index 6c86573d..8401b320 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ path = src/3rdparty/lua url = ../../lolengine/lua.git branch = lol +[submodule "src/3rdparty/pegtl"] + path = src/3rdparty/pegtl + url = ../../lolengine/pegtl.git diff --git a/build/autotools/m4/lol-conf.m4 b/build/autotools/m4/lol-conf.m4 index badea3e6..d7b0eb0a 100644 --- a/build/autotools/m4/lol-conf.m4 +++ b/build/autotools/m4/lol-conf.m4 @@ -80,7 +80,7 @@ fi dnl Use pegtl? Yes, always if true; then - LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/external/pegtl-1.3.1-e7752e81/include" + LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/pegtl" fi diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index 1f6cd103..305de763 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -5,8 +5,8 @@ $(LolDir)\external - $(ExternalDir)\pegtl-1.3.1-e7752e81 - $(PegtlDir)\include + $(LolDir)\src/3rdparty\pegtl + $(PegtlDir) $(LolDir)\src\3rdparty\imgui diff --git a/src/3rdparty/pegtl b/src/3rdparty/pegtl new file mode 160000 index 00000000..e189c111 --- /dev/null +++ b/src/3rdparty/pegtl @@ -0,0 +1 @@ +Subproject commit e189c11133634e0d5e01a0c32ba1aa8174927eed