Switch to upstream Lua master branch.

src/3rdparty/lol-lua.am

@@ -1,43 +1,43 @@
 
+# excluded : ltest.c ltest.h lua.c
 lua_sources = \
-    lua/src/lapi.c lua/src/lapi.h \
-    lua/src/lauxlib.c lua/src/lauxlib.h \
-    lua/src/lbaselib.c \
-    lua/src/lbitlib.c \
-    lua/src/lcode.c lua/src/lcode.h \
-    lua/src/lcorolib.c \
-    lua/src/lctype.c lua/src/lctype.h \
-    lua/src/ldblib.c \
-    lua/src/ldebug.c lua/src/ldebug.h \
-    lua/src/ldo.c lua/src/ldo.h \
-    lua/src/ldump.c \
-    lua/src/lfunc.c lua/src/lfunc.h \
-    lua/src/lgc.c lua/src/lgc.h \
-    lua/src/linit.c \
-    lua/src/liolib.c \
-    lua/src/llex.c lua/src/llex.h \
-    lua/src/llimits.h \
-    lua/src/lmathlib.c \
-    lua/src/lmem.c lua/src/lmem.h \
-    lua/src/loadlib.c \
-    lua/src/lobject.c lua/src/lobject.h \
-    lua/src/lopcodes.c lua/src/lopcodes.h \
-    lua/src/loslib.c \
-    lua/src/lparser.c lua/src/lparser.h \
-    lua/src/lstate.c lua/src/lstate.h \
-    lua/src/lstring.c lua/src/lstring.h \
-    lua/src/lstrlib.c \
-    lua/src/lprefix.h \
-    lua/src/ltable.c lua/src/ltable.h \
-    lua/src/ltablib.c \
-    lua/src/ltm.c lua/src/ltm.h \
-    lua/src/lutf8lib.c \
-    lua/src/luaconf.h \
-    lua/src/lua.h \
-    lua/src/lualib.h \
-    lua/src/lundump.c lua/src/lundump.h \
-    lua/src/lvm.c lua/src/lvm.h \
-    lua/src/lzio.c lua/src/lzio.h
-
-lua_sources += lua/src/lua.hpp
+    lua/lapi.c lua/lapi.h \
+    lua/lauxlib.c lua/lauxlib.h \
+    lua/lbaselib.c \
+    lua/lcode.c lua/lcode.h \
+    lua/lcorolib.c \
+    lua/lctype.c lua/lctype.h \
+    lua/ldblib.c \
+    lua/ldebug.c lua/ldebug.h \
+    lua/ldo.c lua/ldo.h \
+    lua/ldump.c \
+    lua/lfunc.c lua/lfunc.h \
+    lua/lgc.c lua/lgc.h \
+    lua/linit.c \
+    lua/liolib.c \
+    lua/ljumptab.h \
+    lua/llex.c lua/llex.h \
+    lua/llimits.h \
+    lua/lmathlib.c \
+    lua/lmem.c lua/lmem.h \
+    lua/loadlib.c \
+    lua/lobject.c lua/lobject.h \
+    lua/lopcodes.c lua/lopcodes.h \
+    lua/lopnames.h \
+    lua/loslib.c \
+    lua/lparser.c lua/lparser.h \
+    lua/lprefix.h \
+    lua/lstate.c lua/lstate.h \
+    lua/lstring.c lua/lstring.h \
+    lua/lstrlib.c \
+    lua/ltable.c lua/ltable.h \
+    lua/ltablib.c \
+    lua/ltm.c lua/ltm.h \
+    lua/luaconf.h \
+    lua/lua.h \
+    lua/lualib.h \
+    lua/lundump.c lua/lundump.h \
+    lua/lutf8lib.c \
+    lua/lvm.c lua/lvm.h \
+    lua/lzio.c lua/lzio.h
 

src/3rdparty/lol-lua.vcxproj

@@ -58,68 +58,67 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="lua/src/lapi.c" />
-    <ClCompile Include="lua/src/lauxlib.c" />
-    <ClCompile Include="lua/src/lbaselib.c" />
-    <ClCompile Include="lua/src/lbitlib.c" />
-    <ClCompile Include="lua/src/lcode.c" />
-    <ClCompile Include="lua/src/lcorolib.c" />
-    <ClCompile Include="lua/src/lctype.c" />
-    <ClCompile Include="lua/src/ldblib.c" />
-    <ClCompile Include="lua/src/ldebug.c" />
-    <ClCompile Include="lua/src/ldo.c" />
-    <ClCompile Include="lua/src/ldump.c" />
-    <ClCompile Include="lua/src/lfunc.c" />
-    <ClCompile Include="lua/src/lgc.c" />
-    <ClCompile Include="lua/src/linit.c" />
-    <ClCompile Include="lua/src/liolib.c" />
-    <ClCompile Include="lua/src/llex.c" />
-    <ClCompile Include="lua/src/lmathlib.c" />
-    <ClCompile Include="lua/src/lmem.c" />
-    <ClCompile Include="lua/src/loadlib.c" />
-    <ClCompile Include="lua/src/lobject.c" />
-    <ClCompile Include="lua/src/lopcodes.c" />
-    <ClCompile Include="lua/src/loslib.c" />
-    <ClCompile Include="lua/src/lparser.c" />
-    <ClCompile Include="lua/src/lstate.c" />
-    <ClCompile Include="lua/src/lstring.c" />
-    <ClCompile Include="lua/src/lstrlib.c" />
-    <ClCompile Include="lua/src/ltable.c" />
-    <ClCompile Include="lua/src/ltablib.c" />
-    <ClCompile Include="lua/src/ltm.c" />
-    <ClCompile Include="lua/src/lutf8lib.c" />
-    <ClCompile Include="lua/src/lundump.c" />
-    <ClCompile Include="lua/src/lvm.c" />
-    <ClCompile Include="lua/src/lzio.c" />
+    <ClCompile Include="lua/lapi.c" />
+    <ClCompile Include="lua/lauxlib.c" />
+    <ClCompile Include="lua/lbaselib.c" />
+    <ClCompile Include="lua/lcode.c" />
+    <ClCompile Include="lua/lcorolib.c" />
+    <ClCompile Include="lua/lctype.c" />
+    <ClCompile Include="lua/ldblib.c" />
+    <ClCompile Include="lua/ldebug.c" />
+    <ClCompile Include="lua/ldo.c" />
+    <ClCompile Include="lua/ldump.c" />
+    <ClCompile Include="lua/lfunc.c" />
+    <ClCompile Include="lua/lgc.c" />
+    <ClCompile Include="lua/linit.c" />
+    <ClCompile Include="lua/liolib.c" />
+    <ClCompile Include="lua/llex.c" />
+    <ClCompile Include="lua/lmathlib.c" />
+    <ClCompile Include="lua/lmem.c" />
+    <ClCompile Include="lua/loadlib.c" />
+    <ClCompile Include="lua/lobject.c" />
+    <ClCompile Include="lua/lopcodes.c" />
+    <ClCompile Include="lua/loslib.c" />
+    <ClCompile Include="lua/lparser.c" />
+    <ClCompile Include="lua/lstate.c" />
+    <ClCompile Include="lua/lstring.c" />
+    <ClCompile Include="lua/lstrlib.c" />
+    <ClCompile Include="lua/ltable.c" />
+    <ClCompile Include="lua/ltablib.c" />
+    <ClCompile Include="lua/ltm.c" />
+    <ClCompile Include="lua/lundump.c" />
+    <ClCompile Include="lua/lutf8lib.c" />
+    <ClCompile Include="lua/lvm.c" />
+    <ClCompile Include="lua/lzio.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="lua/src/lapi.h" />
-    <ClInclude Include="lua/src/lauxlib.h" />
-    <ClInclude Include="lua/src/lcode.h" />
-    <ClInclude Include="lua/src/lctype.h" />
-    <ClInclude Include="lua/src/ldebug.h" />
-    <ClInclude Include="lua/src/ldo.h" />
-    <ClInclude Include="lua/src/lfunc.h" />
-    <ClInclude Include="lua/src/lgc.h" />
-    <ClInclude Include="lua/src/llex.h" />
-    <ClInclude Include="lua/src/llimits.h" />
-    <ClInclude Include="lua/src/lmem.h" />
-    <ClInclude Include="lua/src/lobject.h" />
-    <ClInclude Include="lua/src/lopcodes.h" />
-    <ClInclude Include="lua/src/lparser.h" />
-    <ClInclude Include="lua/src/lprefix.h" />
-    <ClInclude Include="lua/src/lstate.h" />
-    <ClInclude Include="lua/src/lstring.h" />
-    <ClInclude Include="lua/src/ltable.h" />
-    <ClInclude Include="lua/src/ltm.h" />
-    <ClInclude Include="lua/src/luaconf.h" />
-    <ClInclude Include="lua/src/lua.h" />
-    <ClInclude Include="lua/src/lua.hpp" />
-    <ClInclude Include="lua/src/lualib.h" />
-    <ClInclude Include="lua/src/luawrapper.hpp" />
-    <ClInclude Include="lua/src/lundump.h" />
-    <ClInclude Include="lua/src/lvm.h" />
-    <ClInclude Include="lua/src/lzio.h" />
+    <ClInclude Include="lua/lapi.h" />
+    <ClInclude Include="lua/lauxlib.h" />
+    <ClInclude Include="lua/lcode.h" />
+    <ClInclude Include="lua/lctype.h" />
+    <ClInclude Include="lua/ldebug.h" />
+    <ClInclude Include="lua/ldo.h" />
+    <ClInclude Include="lua/lfunc.h" />
+    <ClInclude Include="lua/lgc.h" />
+    <ClInclude Include="lua/ljumptab.h" />
+    <ClInclude Include="lua/llex.h" />
+    <ClInclude Include="lua/llimits.h" />
+    <ClInclude Include="lua/lmem.h" />
+    <ClInclude Include="lua/lobject.h" />
+    <ClInclude Include="lua/lopcodes.h" />
+    <ClInclude Include="lua/lopnames.h" />
+    <ClInclude Include="lua/lparser.h" />
+    <ClInclude Include="lua/lprefix.h" />
+    <ClInclude Include="lua/lstate.h" />
+    <ClInclude Include="lua/lstring.h" />
+    <ClInclude Include="lua/ltable.h" />
+    <ClInclude Include="lua/ltm.h" />
+    <ClInclude Include="lua/luaconf.h" />
+    <ClInclude Include="lua/lua.h" />
+    <ClInclude Include="lua/lualib.h" />
+    <ClInclude Include="lua/lundump.h" />
+    <ClInclude Include="lua/lvm.h" />
+    <ClInclude Include="lua/lzio.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am">

src/3rdparty/lol-lua.vcxproj.filters

@@ -10,9 +10,6 @@
     <ClCompile Include="lbaselib.c">
       <Filter>upstream</Filter>
     </ClCompile>
-    <ClCompile Include="lbitlib.c">
-      <Filter>upstream</Filter>
-    </ClCompile>
     <ClCompile Include="lcode.c">
       <Filter>upstream</Filter>
     </ClCompile>
@@ -102,9 +99,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="lzio.h">
-      <Filter>upstream</Filter>
-    </ClInclude>
     <ClInclude Include="lapi.h">
       <Filter>upstream</Filter>
     </ClInclude>
@@ -129,6 +123,9 @@
     <ClInclude Include="lgc.h">
       <Filter>upstream</Filter>
     </ClInclude>
+    <ClInclude Include="ljumptab.h">
+      <Filter>upstream</Filter>
+    </ClInclude>
     <ClInclude Include="llex.h">
       <Filter>upstream</Filter>
     </ClInclude>
@@ -144,6 +141,9 @@
     <ClInclude Include="lopcodes.h">
       <Filter>upstream</Filter>
     </ClInclude>
+    <ClInclude Include="lopnames.h">
+      <Filter>upstream</Filter>
+    </ClInclude>
     <ClInclude Include="lparser.h">
       <Filter>upstream</Filter>
     </ClInclude>
@@ -162,15 +162,9 @@
     <ClInclude Include="ltm.h">
       <Filter>upstream</Filter>
     </ClInclude>
-    <ClInclude Include="lutf8lib.h">
-      <Filter>upstream</Filter>
-    </ClInclude>
     <ClInclude Include="lua.h">
       <Filter>upstream</Filter>
     </ClInclude>
-    <ClInclude Include="lua.hpp">
-      <Filter>upstream</Filter>
-    </ClInclude>
     <ClInclude Include="luaconf.h">
       <Filter>upstream</Filter>
     </ClInclude>
@@ -180,9 +174,15 @@
     <ClInclude Include="lundump.h">
       <Filter>upstream</Filter>
     </ClInclude>
+    <ClInclude Include="lutf8lib.h">
+      <Filter>upstream</Filter>
+    </ClInclude>
     <ClInclude Include="lvm.h">
       <Filter>upstream</Filter>
     </ClInclude>
+    <ClInclude Include="lzio.h">
+      <Filter>upstream</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="upstream">

src/3rdparty/lua

@@ -1 +1 @@
-Subproject commit 167fe0b5ef115d637fe44d3592f601b341dc3e7e
+Subproject commit e1f11195396e53ef31cf024651db00e5f8f91e96

src/lolua/baselua.h

@@ -13,8 +13,11 @@
 
 #pragma once
 
-#include "3rdparty/lua/src/lua.hpp"
-//#include "lua/luawrapper.hpp"
+extern "C" {
+#include "3rdparty/lua/lua.h"
+#include "3rdparty/lua/lualib.h"
+#include "3rdparty/lua/lauxlib.h"
+}
 
 #include <string>