Browse Source

build: move PEGTL to a Git submodule

legacy
Sam Hocevar 8 years ago
parent
commit
fb641c9e81
4 changed files with 7 additions and 3 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -1
      build/autotools/m4/lol-conf.m4
  3. +2
    -2
      build/msbuild/lol.vars.props
  4. +1
    -0
      src/3rdparty/pegtl

+ 3
- 0
.gitmodules View File

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

+ 1
- 1
build/autotools/m4/lol-conf.m4 View File

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




+ 2
- 2
build/msbuild/lol.vars.props View File

@@ -5,8 +5,8 @@
<ExternalDir>$(LolDir)\external</ExternalDir>

<!-- PEGTL -->
<PegtlDir>$(ExternalDir)\pegtl-1.3.1-e7752e81</PegtlDir>
<PegtlIncludes>$(PegtlDir)\include</PegtlIncludes>
<PegtlDir>$(LolDir)\src/3rdparty\pegtl</PegtlDir>
<PegtlIncludes>$(PegtlDir)</PegtlIncludes>

<!-- imgui -->
<ImguiDir>$(LolDir)\src\3rdparty\imgui</ImguiDir>


+ 1
- 0
src/3rdparty/pegtl

@@ -0,0 +1 @@
Subproject commit e189c11133634e0d5e01a0c32ba1aa8174927eed

Loading…
Cancel
Save