update Lua-WDK to 5.2

1 files changed, 36 insertions, 46 deletions

diff --git a/win32/ext/lua-wdk/lua-wdk.patch b/win32/ext/lua-wdk/lua-wdk.patch
index 8173d951..5ba3415c 100644
--- a/win32/ext/lua-wdk/lua-wdk.patch
+++ b/win32/ext/lua-wdk/lua-wdk.patch
@@ -1,46 +1,36 @@
-diff -ruN --strip-trailing-cr lua-5.1.4.orig/etc/luavs-x64.bat lua-5.1.4/etc/luavs-x64.bat
---- lua-5.1.4.orig/etc/luavs-x64.bat	1970-01-01 01:00:00 +0100
-+++ lua-5.1.4/etc/luavs-x64.bat	2010-08-16 13:02:08 +0200
-@@ -0,0 +1,28 @@
-+@rem Script to build Lua under "Visual Studio .NET Command Prompt".
-+@rem Do not run from this directory; run it from the toplevel: etc\luavs.bat .
-+@rem It creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.
-+@rem (contributed by David Manura and Mike Pall)
-+
-+@setlocal
-+@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c
-+@set MYLINK=link /nologo msvcrt_win2003.obj
-+@set MYMT=mt /nologo
-+
-+cd src
-+%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
-+del lua.obj luac.obj
-+%MYLINK% /DLL /out:lua51.dll l*.obj
-+if exist lua51.dll.manifest^
-+  %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
-+%MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c
-+%MYLINK% /out:lua.exe lua.obj lua51.lib
-+if exist lua.exe.manifest^
-+  %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe
-+%MYCOMPILE% l*.c print.c
-+del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj^
-+    loslib.obj ltablib.obj lstrlib.obj loadlib.obj
-+%MYLINK% /out:luac.exe *.obj
-+if exist luac.exe.manifest^
-+  %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe
-+del *.obj *.manifest
-+cd ..
-diff -ruN --strip-trailing-cr lua-5.1.4.orig/etc/luavs.bat lua-5.1.4/etc/luavs.bat
---- lua-5.1.4.orig/etc/luavs.bat	2008-01-20 17:40:10 +0100
-+++ lua-5.1.4/etc/luavs.bat	2010-08-16 13:02:18 +0200
-@@ -4,8 +4,8 @@
- @rem (contributed by David Manura and Mike Pall)
- 
- @setlocal
--@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
--@set MYLINK=link /nologo
-+@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c
-+@set MYLINK=link /nologo msvcrt_winxp.obj
- @set MYMT=mt /nologo
- 
- cd src
+diff -ruN --strip-trailing-cr lua-5.2.0.orig/src/lopcodes.h lua-5.2.0/src/lopcodes.h
+--- lua-5.2.0.orig/src/lopcodes.h	2011-07-15 15:50:28 +0200
++++ lua-5.2.0/src/lopcodes.h	2012-01-10 15:41:33 +0100
+@@ -269,7 +269,8 @@
+   OpArgK   /* argument is a constant or register/constant */
+ };
+ 
+-LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
++/* LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES]; */
++const lu_byte luaP_opmodes[NUM_OPCODES];
+ 
+ #define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
+ #define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
+@@ -278,7 +279,8 @@
+ #define testTMode(m)	(luaP_opmodes[m] & (1 << 7))
+ 
+ 
+-LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
++/* LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; */
++const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
+ 
+ 
+ /* number of list items to accumulate before a SETLIST instruction */
+diff -ruN --strip-trailing-cr lua-5.2.0.orig/src/lundump.h lua-5.2.0/src/lundump.h
+--- lua-5.2.0.orig/src/lundump.h	2011-05-06 16:35:16 +0200
++++ lua-5.2.0/src/lundump.h	2012-01-10 15:39:37 +0100
+@@ -17,7 +17,8 @@
+ LUAI_FUNC void luaU_header (lu_byte* h);
+ 
+ /* dump one chunk; from ldump.c */
+-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
++/* LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); */
++LUALIB_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
+ 
+ /* data to catch conversion errors */
+ #define LUAC_TAIL		"\x19\x93\r\n\x1a\n"