diff options
| author | tomas <tomas> | 2006-06-08 16:23:25 +0000 |
|---|---|---|
| committer | tomas <tomas> | 2006-06-08 16:23:25 +0000 |
| commit | b6c8c1394289d63100c738cd7322a4486cd076a6 (patch) | |
| tree | da96411a69b0e2cd4cde0d21b5da7903d41fbb17 | |
| parent | 59ef09d270fbcc74b45bfc617dbdba45783169d8 (diff) | |
| download | luafilesystem-b6c8c1394289d63100c738cd7322a4486cd076a6.tar.gz luafilesystem-b6c8c1394289d63100c738cd7322a4486cd076a6.tar.bz2 luafilesystem-b6c8c1394289d63100c738cd7322a4486cd076a6.zip | |
Adding support for compilation on both Lua 5.0 and Lua 5.1
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | config | 7 |
2 files changed, 10 insertions, 2 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | # $Id: Makefile,v 1.26 2005/06/27 17:06:01 tomas Exp $ | 1 | # $Id: Makefile,v 1.27 2006/06/08 16:23:25 tomas Exp $ |
| 2 | 2 | ||
| 3 | T= lfs | 3 | T= lfs |
| 4 | V= 1.2 | 4 | V= 1.2 |
| @@ -6,7 +6,10 @@ CONFIG= ./config | |||
| 6 | 6 | ||
| 7 | include $(CONFIG) | 7 | include $(CONFIG) |
| 8 | 8 | ||
| 9 | ifeq "$(LUA_VERSION_NUM)" "500" | ||
| 9 | COMPAT_O= $(COMPAT_DIR)/compat-5.1.o | 10 | COMPAT_O= $(COMPAT_DIR)/compat-5.1.o |
| 11 | endif | ||
| 12 | |||
| 10 | SRCS= src/$T.c | 13 | SRCS= src/$T.c |
| 11 | OBJS= src/$T.o $(COMPAT_O) | 14 | OBJS= src/$T.o $(COMPAT_O) |
| 12 | 15 | ||
| @@ -9,6 +9,11 @@ LIB_OPTION= -shared #for Linux | |||
| 9 | #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X | 9 | #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X |
| 10 | 10 | ||
| 11 | LIBNAME= $T.so.$V | 11 | LIBNAME= $T.so.$V |
| 12 | # Lua version number | ||
| 13 | # (according to Lua 5.1 definition: | ||
| 14 | # first version digit * 100 + second version digit | ||
| 15 | # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501) | ||
| 16 | LUA_VERSION_NUM= 500 | ||
| 12 | COMPAT_DIR= ../compat/src | 17 | COMPAT_DIR= ../compat/src |
| 13 | 18 | ||
| 14 | # Compilation directives | 19 | # Compilation directives |
| @@ -17,4 +22,4 @@ INCS= -I$(LUA_INC) -I$(COMPAT_DIR) | |||
| 17 | CFLAGS= $(WARN) $(INCS) | 22 | CFLAGS= $(WARN) $(INCS) |
| 18 | CC= gcc | 23 | CC= gcc |
| 19 | 24 | ||
| 20 | # $Id: config,v 1.14 2005/06/24 01:49:16 tomas Exp $ | 25 | # $Id: config,v 1.15 2006/06/08 16:23:25 tomas Exp $ |
