Make lol-lua an optional dependency.

build/autotools/m4/lol-conf.m4

@@ -244,7 +244,7 @@ LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS"
 LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS"
 LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/liblol-core.a"
 LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/3rdparty/liblol-bullet.a"
-LOL_DEPS="${LOL_DEPS} \$(lol_builddir)/src/3rdparty/liblol-lua.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)/src"
@@ -257,6 +257,7 @@ dnl  Extra flags
 AC_SUBST(LOL_CFLAGS)
 AC_SUBST(LOL_LIBS)
 AC_SUBST(LOL_DEPS)
+AC_SUBST(LOL_LUA_DEPS)
 
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CPPFLAGS)

doc/samples/benchsuite.vcxproj

@@ -44,9 +44,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B1E10086-A1DA-401A-834D-969C9DBB5CC1}</ProjectGuid>

doc/samples/btphystest.vcxproj

@@ -54,9 +54,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am">

doc/samples/meshviewer/Makefile.am

@@ -11,7 +11,7 @@ meshviewer_SOURCES = meshviewer.cpp meshviewer.h \
     scenesetup.cpp scenesetup.h \
     shinymvtexture.lolfx shinyfur.lolfx
 meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
-meshviewer_DEPENDENCIES = @LOL_DEPS@
+meshviewer_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@
 meshviewer_LDFLAGS = $(AM_LDFLAGS)
 if LOL_USE_EMSCRIPTEN
 meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']"

doc/samples/meshviewer/meshviewer.cpp

@@ -18,6 +18,8 @@
 #include <cfloat> /* for FLT_MAX */
 
 #include <lol/engine.h>
+#include <lol/lua.h>
+
 #include "scenesetup.h"
 
 using namespace lol;

doc/samples/meshviewer/scenesetup.cpp

@@ -14,6 +14,8 @@
 #endif
 
 #include <lol/engine.h>
+#include <lol/lua.h>
+
 #include "scenesetup.h"
 
 namespace lol

doc/samples/nacl_phystest.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am">

doc/tutorial/01_triangle.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{b92abadc-45be-4cc5-b724-9426053123a1}</ProjectGuid>

doc/tutorial/02_cube.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7b083da2-fe08-4f6d-bfdd-195d5c2783eb}</ProjectGuid>

doc/tutorial/03_noise.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{b0a53d75-cbb4-4fdf-93ac-2d12a79ada0e}</ProjectGuid>

doc/tutorial/04_texture.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{834852db-edb6-4fd0-bcf9-45cd01126962}</ProjectGuid>

doc/tutorial/05_easymesh.cpp

@@ -16,6 +16,7 @@
 #endif
 
 #include <lol/engine.h>
+#include <lol/lua.h>
 
 using namespace lol;
 

doc/tutorial/06_sprite.vcxproj

@@ -40,9 +40,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}</ProjectGuid>

doc/tutorial/07_input.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}</ProjectGuid>

doc/tutorial/08_fbo.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}</ProjectGuid>

doc/tutorial/11_fractal.vcxproj

@@ -43,9 +43,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6bf81b39-edc2-4227-9992-c2d8abea95af}</ProjectGuid>

doc/tutorial/12_voronoi.vcxproj

@@ -47,9 +47,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6bf81b39-edc2-4227-9982-c2d8abea95af}</ProjectGuid>

doc/tutorial/13_shader_builder.vcxproj

@@ -37,9 +37,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="13_shader_builder.cpp" />

doc/tutorial/14_lol_lua.cpp

@@ -15,6 +15,8 @@
 #endif
 
 #include <lol/engine.h>
+#include <lol/lua.h>
+
 #include "loldebug.h"
 #include <cstdio>
 

doc/tutorial/15_lolimgui.vcxproj

@@ -37,9 +37,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="15_lolimgui.cpp" />

doc/tutorial/Makefile.am

@@ -31,7 +31,7 @@ tutorials += 16_movie
 
 05_easymesh_SOURCES = 05_easymesh.cpp
 05_easymesh_CPPFLAGS = $(AM_CPPFLAGS)
-05_easymesh_DEPENDENCIES = @LOL_DEPS@
+05_easymesh_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@
 
 06_sprite_SOURCES = 06_sprite.cpp 06_sprite.png
 06_sprite_CPPFLAGS = $(AM_CPPFLAGS)
@@ -69,7 +69,7 @@ endif
 
 14_lol_lua_SOURCES = 14_lol_lua.cpp
 14_lol_lua_CPPFLAGS = $(AM_CPPFLAGS)
-14_lol_lua_DEPENDENCIES = @LOL_DEPS@
+14_lol_lua_DEPENDENCIES = @LOL_DEPS@ @LOL_LUA_DEPS@
 
 15_lolimgui_SOURCES = 15_lolimgui.cpp
 15_lolimgui_CPPFLAGS = $(AM_CPPFLAGS)

src/Makefile.am

@@ -31,6 +31,7 @@ liblol_core_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/bullet3/src -I$(src
 
 liblol_core_headers = \
     lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h lol/legacy.h \
+    lol/lua.h \
     \
     lol/base/all.h \
     lol/base/avl_tree.h lol/base/features.h lol/base/tuple.h lol/base/types.h \

src/application/application.cpp

@@ -176,7 +176,6 @@ Application::Application(char const *name, ivec2 resolution, float framerate)
 {
     SceneDisplay::Add(new ApplicationDisplay(name, resolution));
     data = new ApplicationData(name, resolution, framerate);
-    g_world.ExecLuaFile("lua/init.lua");
 }
 
 bool Application::MustTick()

src/easymesh/easymeshlua.cpp

@@ -17,6 +17,7 @@
 #include <cstdio>
 
 #include <lol/engine.h>
+#include <lol/lua.h>
 #include "loldebug.h"
 
 using namespace lol;

src/engine/world.cpp

@@ -24,7 +24,6 @@ namespace lol
 class WorldData
 {
     friend class World;
-    lua_State *m_lua_state;
 };
 
 static WorldData g_world_data;
@@ -35,9 +34,7 @@ World g_world;
  */
 
 World::World()
-    : LuaLoader()
 {
-    g_world_data.m_lua_state = GetLuaState();
 }
 
 World::~World()

src/engine/world.h

@@ -18,7 +18,7 @@
 namespace lol
 {
 
-class World : public LuaLoader
+class World
 {
 public:
     World();

src/lol-core.vcxproj

@@ -292,6 +292,7 @@
     <ClInclude Include="lol\image\movie.h" />
     <ClInclude Include="lol\image\pixel.h" />
     <ClInclude Include="lol\image\resource.h" />
+    <ClInclude Include="lol\lua.h" />
     <ClInclude Include="lol\math\all.h" />
     <ClInclude Include="lol\math\arraynd.h" />
     <ClInclude Include="lol\math\bigint.h" />
@@ -400,9 +401,6 @@
     <ProjectReference Include="3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/lol-core.vcxproj.filter

@@ -505,6 +505,9 @@
     <ClInclude Include="lol\extras.h">
       <Filter>lol</Filter>
     </ClInclude>
+    <ClInclude Include="lol\lua.h">
+      <Filter>lol</Filter>
+    </ClInclude>
     <ClInclude Include="lol\public.h">
       <Filter>lol</Filter>
     </ClInclude>

src/lol/extras.h

@@ -20,9 +20,6 @@
 #include <lol/../utils.h>
 #include <lol/../numeric.h>
 
-// Lua
-#include <lol/../lolua/baselua.h>
-
 // Static classes
 #include <lol/../platform.h>
 #include <lol/../video.h>
@@ -59,7 +56,6 @@
 #include <lol/../application/application.h>
 #include <lol/../easymesh/csgbsp.h>
 #include <lol/../easymesh/easymesh.h>
-#include <lol/../easymesh/easymeshlua.h>
 
 // Managers
 #include <lol/../forge.h>

src/lol/lua.h

@@ -0,0 +1,23 @@
+//
+//  Lol Engine
+//
+//  Copyright © 2010—2017 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
+//
+
+#pragma once
+
+//
+// Lua subsystem
+// -------------
+//
+
+// Lua
+#include <lol/../lolua/baselua.h>
+#include <lol/../easymesh/easymeshlua.h>
+

src/lolua/baselua.cpp

@@ -12,6 +12,7 @@
 //
 
 #include <lol/engine-internal.h>
+#include <lol/lua.h>
 
 #include <cstring>
 #include <cstdlib>

src/t/test-base.vcxproj

@@ -45,9 +45,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8f59a635-0240-4d7f-a80d-050c3f1670c2}</ProjectGuid>

src/t/test-entity.vcxproj

@@ -41,9 +41,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{d7f6c2ca-5a13-4fd0-8468-1833923e3ee3}</ProjectGuid>

src/t/test-image.vcxproj

@@ -42,9 +42,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5a27ff18-a1ec-49be-9455-415f1c701153}</ProjectGuid>

src/t/test-math.vcxproj

@@ -58,9 +58,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{962d4e25-45d3-4ace-8c02-69fa3713abd4}</ProjectGuid>

src/t/test-sys.vcxproj

@@ -41,9 +41,6 @@
     <ProjectReference Include="$(LolDir)\src\3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(LolDir)\src\3rdparty\lol-lua.vcxproj">
-      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1782f849-b6e1-466d-9f02-a751f3f8712c}</ProjectGuid>