Merge with default

3 files changed, 112 insertions, 0 deletions

diff --git a/ext/lua-wdk/build-x64.bat b/ext/lua-wdk/build-x64.bat
new file mode 100644
index 00000000..a160cd97
--- /dev/null
+++ b/ext/lua-wdk/build-x64.bat
@@ -0,0 +1,33 @@
+@echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

+set OPATH=%PATH%

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk

+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64

+set DEST=..\lua-wdk-5.1.4-2-x64

+call etc\luavs-x64.bat

+@echo off

+echo.Press return when ready to install!

+pause

+set PATH=%OPATH%

+rmdir /Q /S %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

+copy COPYRIGHT %DEST%\LICENSE.LUA

+:: binaries and libraries

+copy src\lua.exe %DEST%\bin

+copy src\lua51.dll %DEST%\bin

+copy src\lua51.exp %DEST%\bin

+copy src\luac.exe %DEST%\bin

+:: library

+copy src\lua51.lib %DEST%\lib

+:: api

+copy src\lua.h %DEST%\include

+copy src\luaconf.h %DEST%\include

+copy src\lualib.h %DEST%\include

+copy src\lauxlib.h %DEST%\include

+copy etc\lua.hpp %DEST%\include

+echo.Finished!

+pause

diff --git a/ext/lua-wdk/build-x86.bat b/ext/lua-wdk/build-x86.bat
new file mode 100644
index 00000000..75a054ed
--- /dev/null
+++ b/ext/lua-wdk/build-x86.bat
@@ -0,0 +1,33 @@
+@echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

+set OPATH=%PATH%

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk

+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE

+set DEST=..\lua-wdk-5.1.4-2-x86

+call etc\luavs.bat

+@echo off

+echo.Press return when ready to install!

+pause

+set PATH=%OPATH%

+rmdir /Q /S %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

+copy COPYRIGHT %DEST%\LICENSE.LUA

+:: binaries and libraries

+copy src\lua.exe %DEST%\bin

+copy src\lua51.dll %DEST%\bin

+copy src\lua51.exp %DEST%\bin

+copy src\luac.exe %DEST%\bin

+:: library

+copy src\lua51.lib %DEST%\lib

+:: api

+copy src\lua.h %DEST%\include

+copy src\luaconf.h %DEST%\include

+copy src\lualib.h %DEST%\include

+copy src\lauxlib.h %DEST%\include

+copy etc\lua.hpp %DEST%\include

+echo.Finished!

+pause

diff --git a/ext/lua-wdk/lua-wdk.patch b/ext/lua-wdk/lua-wdk.patch
new file mode 100644
index 00000000..8173d951
--- /dev/null
+++ b/ext/lua-wdk/lua-wdk.patch
@@ -0,0 +1,46 @@
+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