Add the core branch as a submodule.

.gitmodules

@@ -1,7 +1,14 @@
+# The "core" submodule is another branch of ourselves
+[submodule "core"]
+	path = lol-core
+	url = ../../lolengine/lol.git
+	branch = core/master
+
 [submodule "external"]
 	path = external
 	url = ../../lolengine/ext-binaries.git
 	branch = master
+
 [submodule "imgui"]
 	path = src/3rdparty/imgui
 	url = ../../lolengine/ext-imgui.git

build/autotools/m4/lol-conf.m4

@@ -266,6 +266,7 @@ LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/liblol-core.a"
 LOL_LUA_DEPS="${LOL_LUA_DEPS} \$(lol_builddir)/src/3rdparty/liblol-lua.a"
 
 dnl  How to use the Lol Engine inside this tree
+AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(lol_srcdir)/lol-core/include"
 AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(lol_srcdir)/src"
 AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_CONFIG_SOURCESUBDIR=\\\"\$(subdir)\\\""
 AM_CPPFLAGS="${AM_CPPFLAGS} ${LOL_CFLAGS}"

build/msbuild/lol.rules.props

@@ -26,6 +26,7 @@
       <ObjectFileName>$(IntDir)/%(Directory)/</ObjectFileName>
 
       <AdditionalIncludeDirectories>
+          $(LolDir)\lol-core\include;
           $(LolDir)\src;
           $(LolDir)\src\3rdparty\bullet3\src;
           $(LolDir)\tools\lolunit;

lol-core

@@ -0,0 +1 @@
+Subproject commit 29336e3d2fcd112d6f66bc5d8569876ccb22b6ec