diff options
-rw-r--r-- | doc/contents.html | 3 | ||||
-rw-r--r-- | etc/luavs.bat | 35 | ||||
-rw-r--r-- | src/Makefile | 6 | ||||
-rw-r--r-- | src/lbaselib.c | 7 |
4 files changed, 32 insertions, 19 deletions
diff --git a/doc/contents.html b/doc/contents.html index 4d253e54..8e58e18c 100644 --- a/doc/contents.html +++ b/doc/contents.html @@ -384,6 +384,7 @@ Freely available under the terms of the <A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR> <A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR> <A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR> +<A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR> <A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR> <A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR> <A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR> @@ -488,7 +489,7 @@ Freely available under the terms of the <HR> <SMALL> Last update: -Fri Jan 18 10:36:25 BRST 2008 +Sat Jan 19 13:24:29 BRST 2008 </SMALL> <!-- Last change: revised for Lua 5.1.3 diff --git a/etc/luavs.bat b/etc/luavs.bat index 6b1120b8..d1ad267c 100644 --- a/etc/luavs.bat +++ b/etc/luavs.bat @@ -1,15 +1,28 @@ -rem script to build Lua under "Visual Studio .NET Command Prompt".
-rem do not run it 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 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 David Manura <dm.lua@math2.org> and Mike Pall <mikelu-0801@mike.de>
+
+@setlocal
+@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
+@set MYLINK=link /nologo
+@set MYMT=mt /nologo
cd src
-cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL l*.c
+%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
del lua.obj luac.obj
-link /DLL /out:lua51.dll l*.obj
-cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL lua.c
-link /out:lua.exe lua.obj lua51.lib
-cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE 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
-del *.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 --git a/src/Makefile b/src/Makefile index 748d0f8d..e4a3cd61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,9 +99,9 @@ linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" macosx: - $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX -# use this on Mac OS X 10.4 -# $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline" + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" +# use this on Mac OS X 10.3- +# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX mingw: $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \ diff --git a/src/lbaselib.c b/src/lbaselib.c index cdeb15ca..eb06bcef 100644 --- a/src/lbaselib.c +++ b/src/lbaselib.c @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.191.1.3 2008/01/03 15:20:39 roberto Exp $ +** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $ ** Basic library ** See Copyright Notice in lua.h */ @@ -595,9 +595,8 @@ static int luaB_yield (lua_State *L) { static int luaB_corunning (lua_State *L) { if (lua_pushthread(L)) - return 0; /* main thread is not a coroutine */ - else - return 1; + lua_pushnil(L); /* main thread is not a coroutine */ + return 1; } |