updated MSVC build

diff --git a/src/win32/make-win32-msvc.bat b/src/win32/make-win32-msvc.bat
index 6fe66f31e8610e262f8d8eb8f9f8f3884a32b5a5..3cb4002134b69549da9c23ec619babe9a0d5f7fa 100644 (file)
--- a/src/win32/make-win32-msvc.bat
+++ b/src/win32/make-win32-msvc.bat
@@ -1,29 +1,40 @@
-set MLUALIB_TARGET=c:\tmp\mlualib
+@REM ***************************************************************************
+@REM * Customize these two variables: 
+@REM * Target directory, path to compiler, compiler and linker executables.
+@REM ***************************************************************************
 
-set MSVCDIR=
-@set COMPILE=%MSVCDIR%cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
-@set LINK=%MSVCDIR%link /nologo
-@set MT=%MSVCDIR%mt /nologo
+@set MLUALIB_TARGET=d:\tmp\mlualib
+@set MSVCDIR=c:\msvc\vc98\bin
+@set COMPILE=%MSVCDIR%\cl /nologo /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@REM Don't ever set a variable called 'LINK', it breaks the MSVC linker!
+@set LINK_=%MSVCDIR%\link /nologo
+@set MT=%MSVCDIR%\mt /nologo
+
+@REM ***************************************************************************
+@REM * End of customizable part.
+@REM ***************************************************************************
 
 md %MLUALIB_TARGET%
 
 :lua
-@REM Build lua51.dll, lua51.lib, lua.exe, luac.exe
-@REM Code taken straight from Lua's etc/luavs.bat
+@REM ***************************************************************************
+@REM * Build lua51.dll, lua51.lib, lua.exe, luac.exe.
+@REM * Code taken straight from Lua's etc/luavs.bat.
+@REM ***************************************************************************
 cd lua
-%COMPILE% /DLUA_BUILD_AS_DLL l*.c
+%COMPILE% /c /DLUA_BUILD_AS_DLL l*.c
 del lua.obj luac.obj
-%LINK% /DLL /out:lua51.dll l*.obj
+%LINK_% /DLL /out:lua51.dll l*.obj
 if exist lua51.dll.manifest^
   %MT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
-%COMPILE% /DLUA_BUILD_AS_DLL lua.c
-%LINK% /out:lua.exe lua.obj lua51.lib
+%COMPILE% /c /DLUA_BUILD_AS_DLL lua.c
+%LINK_% /out:lua.exe lua.obj lua51.lib
 if exist lua.exe.manifest^
   %MT% -manifest lua.exe.manifest -outputresource:lua.exe
-%COMPILE% l*.c print.c
+%COMPILE% /c 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
-%LINK% /out:luac.exe *.obj
+%LINK_% /out:luac.exe *.obj
 if exist luac.exe.manifest^
   %MT% -manifest luac.exe.manifest -outputresource:luac.exe
 del *.obj *.manifest
@@ -34,26 +45,37 @@ copy *.dll %MLUALIB_TARGET%
 cd ..
 
 :srclibs
-@REM copy libraries
+@REM ***************************************************************************
+@REM * Copy library source files.
+@REM ***************************************************************************
 xcopy /E /Y lib %MLUALIB_TARGET%
 
 :binlibs
-@REM compile and install binary libs
+@REM ***************************************************************************
+@REM * Compile and install binary libs.
+@REM ***************************************************************************
 cd binlibs
 %COMPILE% /LD /DLUA_BUILD_AS_DLL /DLUA_LIB /DBUILTIN_CAST /I..\lua bit.c ..\lua\lua51.lib
 %COMPILE% /LD /DLUA_BUILD_AS_DLL /DLUA_LIB /I..\lua rings.c ..\lua\lua51.lib
-%COMPILE% /LD /DLUA_BUILD_AS_DLL /DLUA_LIB /I..\lua pluto.c ..\lua\lua51.lib
+%COMPILE%  /Fepluto.dll /LD /DLUA_BUILD_AS_DLL /DLUA_LIB /I..\lua /I pluto pluto\*.c ..\lua\lua51.lib
+
 xcopy /Y rings.dll %MLUALIB_TARGET%
 xcopy /Y bit.dll   %MLUALIB_TARGET%
 xcopy /Y pluto.dll %MLUALIB_TARGET%
 cd ..
 
+
 :w32stub
+@REM ***************************************************************************
+@REM * Generate a .bat file to call metalua front-end from the shell.
+@REM ***************************************************************************
 echo @set LUA_ROOT=%MLUALIB_TARGET%> %MLUALIB_TARGET%\metalua.bat
 type win32\metalua.bat >> %MLUALIB_TARGET%\metalua.bat
 
 :setenv
-@REM set Metalua environment
+@REM ***************************************************************************
+@REM * Set metalua environment.
+@REM ***************************************************************************
 echo set LUA_ROOT=%MLUALIB_TARGET%> mlua_setenv.bat
 echo set LUA_PATH=?.luac;?.lua;%MLUALIB_TARGET%\?.luac;%MLUALIB_TARGET%\?.lua>> mlua_setenv.bat
 echo set LUA_CPATH=?.dll;%MLUALIB_TARGET%\?.dll;%MLUALIB_TARGET%\?\linit.dll>> mlua_setenv.bat
@@ -62,7 +84,9 @@ echo set PATH=%MLUALIB_TARGET%;%PATH%>> mlua_setenv.bat
 CALL mlua_setenv.bat
 
 :compiler
-@REM Build the compiler *.lua libs
+@REM ***************************************************************************
+@REM * Build the compiler *.lua libs.
+@REM ***************************************************************************
 cd compiler
 set LUA=..\lua\lua.exe
 set LUAC=..\lua\luac.exe
@@ -71,7 +95,9 @@ set LUAC=..\lua\luac.exe
 xcopy /Y bytecode.luac %MLUALIB_TARGET%
 xcopy /Y mlp.luac %MLUALIB_TARGET%
 
-@REM Build the compiler *.mlua parts
+@REM ***************************************************************************
+@REM * Build the compiler *.mlua parts.
+@REM ***************************************************************************
 %LUA% bootstrap.lua mlc.mlua
 %LUA% bootstrap.lua metalua.mlua
 copy /Y mlc.luac %MLUALIB_TARGET%
@@ -79,5 +105,7 @@ copy /Y metalua.luac %MLUALIB_TARGET%
 cd ..
 
 :compile_srclib
-@REM Precompile the .mlua files in the library
-lua\lua win32\precompile.lua %MLUALIB_TARGET%
\ No newline at end of file
+@REM ***************************************************************************
+@REM * Precompile the .mlua files in the library.
+@REM ***************************************************************************
+lua\lua win32\precompile.lua %MLUALIB_TARGET%