Merging the trunk changes for the 1.2.1 release

This commit is contained in:
carregal
2007-05-08 21:35:10 +00:00
parent 0147f85957
commit 00be93ab51
12 changed files with 141 additions and 46 deletions

9
config
View File

@@ -1,20 +1,19 @@
# Installation directories
# System's libraries directory (where binary libraries are installed)
LUA_LIBDIR= /usr/local/lib/lua/5.0
LUA_LIBDIR= /usr/local/lib/lua/5.1
# Lua includes directory
LUA_INC= /usr/local/include
LUA_INC= /usr/local/include/lua51
# OS dependent
LIB_OPTION= -shared #for Linux
#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
LIBNAME= $T.so.$V
COMPAT_DIR= ../compat/src
# Compilation directives
WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
INCS= -I$(LUA_INC)
CFLAGS= $(WARN) $(INCS)
CC= gcc
# $Id: config,v 1.14 2005/06/24 01:49:16 tomas Exp $
# $Id: config,v 1.14.2.1 2007/05/08 21:35:10 carregal Exp $