summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile12
-rw-r--r--src/luaconf.h7
2 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile
index d95687a..aa44911 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,7 +11,7 @@ CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
-AR= ar rcu
+ARL= ar rcu
RANLIB= ranlib
RM= rm -f
@@ -56,8 +56,8 @@ o: $(ALL_O)
a: $(ALL_A)
$(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
- $(RANLIB) $@
+ $(ARL) $@ $(BASE_O)
+ #$(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
@@ -77,7 +77,7 @@ echo:
@echo "CFLAGS= $(CFLAGS)"
@echo "LDFLAGS= $(SYSLDFLAGS)"
@echo "LIBS= $(LIBS)"
- @echo "AR= $(AR)"
+ @echo "ARL= $(ARL)"
@echo "RANLIB= $(RANLIB)"
@echo "RM= $(RM)"
@@ -89,7 +89,7 @@ none:
@echo " $(PLATS)"
rainbow:
- $(MAKE) $(ALL) MYOBJS=rblib.o SYSCFLAGS="-DLUA_USE_C89" CC="owcc" CFLAGS="-I/opt/openwatcom/h -march=i86 -msoft-float -mcmodel=l -b DOS" LDFLAGS="-march=i86 -msoft-float -mcmodel=l -b DOS" AR="wlib -r -c " LUA_A="lua53.lib" LUA_T="lua.exe" LUAC_T="luac.exe" LIBS="-L$(WATCOM)/lib286 -L$(WATCOM)/lib286/dos"
+ $(MAKE) $(ALL) MYOBJS=rblib.o SYSCFLAGS="-DLUA_USE_C89" CC="owcc" CFLAGS="-I/opt/openwatcom/h -march=i86 -mcmodel=l -b DOS -mregparm=1 -v -mhard-emu-float" LDFLAGS="-mregparm=1 -march=i86 -mcmodel=l -mstack-size=45k -v -b DOS -mhard-emu-float" ARL="wlib -r -c " LUA_A="lua53.lib" LUA_T="lua.exe" LUAC_T="luac.exe" LIBS="-L$(WATCOM)/lib286 -L$(WATCOM)/lib286/dos"
aix:
$(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall"
@@ -117,7 +117,7 @@ macosx:
mingw:
$(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \
- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+ "ARL=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
"SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe
$(MAKE) "LUAC_T=luac.exe" luac.exe
diff --git a/src/luaconf.h b/src/luaconf.h
index 9eeeea6..28772d9 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -1,4 +1,4 @@
-/*
+ /*
** $Id: luaconf.h,v 1.259.1.1 2017/04/19 17:29:57 roberto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
@@ -728,7 +728,7 @@
#if LUAI_BITSINT >= 32
#define LUAI_MAXSTACK 1000000
#else
-#define LUAI_MAXSTACK 15000
+#define LUAI_MAXSTACK 500
#endif
@@ -758,7 +758,8 @@
#if LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE
#define LUAL_BUFFERSIZE 8192
#else
-#define LUAL_BUFFERSIZE ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer)))
+#define LUAL_BUFFERSIZE 256
+/* ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer))) */
#endif
/* }================================================================== */