Lua 5.2 compatibility.

6 files changed, 32 insertions, 21 deletions

diff --git a/windows/mingw/_mingw.mak b/windows/mingw/_mingw.mak
index 6eed649..668a8df 100644
--- a/windows/mingw/_mingw.mak
+++ b/windows/mingw/_mingw.mak
@@ -1,18 +1,28 @@
-# tested with GNU Make
+# Use with GNU Make.
 
 # User Settings ------------------------------------------------------------
-# path of Lua include files
-LUAINC = s:\progr\work\system\include
 
-# name of Lua DLL to link to (.dll should be omitted)
-LUADLL = lua5.1
+# Path of Lua include files.
+# Name of Lua DLL to link to (.dll should be omitted).
+# Name of Lua interpreter.
+# Path to install the built DLL.
+
+ifeq ($(LUAVERSION),51)
+  LUAINC = s:\progr\work\system\include\lua51
+  LUADLL = lua5.1
+  LUAEXE = lua.exe
+  INSTALLPATH = s:\exe\lib\lua\5.1
+else
+  LUAINC = s:\progr\work\system\include\lua52
+  LUADLL = lua52
+  LUAEXE = lua52.exe
+  INSTALLPATH = s:\exe\lib\lua\5.2
+endif
 
-# path to install rex_onig.dll
-INSTALLPATH = s:\exe\lib\lua\5.1
 # --------------------------------------------------------------------------
 
-LIBS       = $(MYLIBS) -s
-INCS       = $(MYINCS)
+LIBS       = -l$(LUADLL) $(MYLIBS) -s
+INCS       = -I$(LUAINC) $(MYINCS)
 BIN        = $(PROJECT).dll
 DEFFILE    = $(PROJECT).def
 BININSTALL = $(INSTALLPATH)\$(BIN)
@@ -33,7 +43,7 @@ clean:
 install: $(BININSTALL)
 
 test:
-	cd $(TESTPATH) && lua runtest.lua $(TESTNAME) -d$(CURDIR)
+	cd $(TESTPATH) && $(LUAEXE) runtest.lua $(TESTNAME) -d$(CURDIR)
 
 $(BIN): $(OBJ) $(DEFFILE)
 	$(CC) $(DEFFILE) $(OBJ) $(LIBS) -o $@ -shared
diff --git a/windows/mingw/rex_gnu.mak b/windows/mingw/rex_gnu.mak
index 65398bc..9c4c81b 100644
--- a/windows/mingw/rex_gnu.mak
+++ b/windows/mingw/rex_gnu.mak
@@ -6,8 +6,8 @@ REGEXINC = s:\progr\work\system\include\gnuregex
 # --------------------------------------------------------------------------
 
 PROJECT  = rex_gnu
-MYINCS   = -I$(REGEXINC) -I$(LUAINC) 
-MYLIBS   = -lregex2 -l$(LUADLL)
+MYINCS   = -I$(REGEXINC)
+MYLIBS   = -lregex2
 OBJ      = lgnu.o common.o
 MYCFLAGS = -W -Wall -O2
 EXPORTED = luaopen_$(PROJECT)
diff --git a/windows/mingw/rex_onig.mak b/windows/mingw/rex_onig.mak
index 39f6a8f..eae3255 100644
--- a/windows/mingw/rex_onig.mak
+++ b/windows/mingw/rex_onig.mak
@@ -6,8 +6,8 @@ REGEXINC = s:\progr\work\system\include
 # --------------------------------------------------------------------------
 
 PROJECT  = rex_onig
-MYINCS   = -I$(REGEXINC) -I$(LUAINC) 
-MYLIBS   = -lonig -l$(LUADLL) -Wl,--enable-auto-import
+MYINCS   = -I$(REGEXINC)
+MYLIBS   = -lonig -Wl,--enable-auto-import
 OBJ      = lonig.o lonig_f.o common.o
 MYCFLAGS = -W -Wall -O2
 EXPORTED = luaopen_$(PROJECT)
diff --git a/windows/mingw/rex_pcre.mak b/windows/mingw/rex_pcre.mak
index afd9871..c8b7a5c 100644
--- a/windows/mingw/rex_pcre.mak
+++ b/windows/mingw/rex_pcre.mak
@@ -6,8 +6,8 @@ REGEXINC = s:\progr\work\system\include
 # --------------------------------------------------------------------------
 
 PROJECT  = rex_pcre
-MYINCS   = -I$(REGEXINC) -I$(LUAINC) 
-MYLIBS   = -lpcre -l$(LUADLL)
+MYINCS   = -I$(REGEXINC)
+MYLIBS   = -lpcre
 OBJ      = lpcre.o lpcre_f.o common.o
 MYCFLAGS = -W -Wall -O2
 EXPORTED = luaopen_$(PROJECT)
diff --git a/windows/mingw/rex_spencer.mak b/windows/mingw/rex_spencer.mak
index da2338c..97e82be 100644
--- a/windows/mingw/rex_spencer.mak
+++ b/windows/mingw/rex_spencer.mak
@@ -6,8 +6,8 @@ REGEXINC = s:\progr\work\system\include\rxspencer
 # --------------------------------------------------------------------------
 
 PROJECT  = rex_spencer
-MYINCS   = -I$(REGEXINC) -I$(LUAINC) 
-MYLIBS   = -lrxspencer -l$(LUADLL)
+MYINCS   = -I$(REGEXINC)
+MYLIBS   = -lrxspencer
 OBJ      = lposix.o common.o
 MYCFLAGS = -W -Wall -O2
 EXPORTED = luaopen_$(PROJECT)
diff --git a/windows/mingw/rex_tre.mak b/windows/mingw/rex_tre.mak
index 3da6138..9515f50 100644
--- a/windows/mingw/rex_tre.mak
+++ b/windows/mingw/rex_tre.mak
@@ -6,9 +6,10 @@ REGEXINC = s:\progr\work\system\include
 # --------------------------------------------------------------------------
 
 PROJECT  = rex_tre
-MYINCS   = -I$(REGEXINC) -I$(LUAINC) 
-MYLIBS   = -ltre -l$(LUADLL)
-OBJ      = ltre.o ltre_w.o common.o
+MYINCS   = -I$(REGEXINC)
+MYLIBS   = -ltre
+# OBJ    = ltre.o ltre_w.o common.o
+OBJ      = ltre.o common.o
 MYCFLAGS = -W -Wall -O2
 EXPORTED = luaopen_$(PROJECT)
 SRCPATH  = ..\..\src;..\..\src\tre