Changes related to Oniguruma addition and directory layout change.

4 files changed, 41 insertions, 2 deletions

diff --git a/windows/mingw/Makefile b/windows/mingw/Makefile
index 0c7fdfb..5b78e95 100755
--- a/windows/mingw/Makefile
+++ b/windows/mingw/Makefile
@@ -5,18 +5,22 @@ all: build test
 build:
 	make -f rex_pcre.mak
 	make -f rex_spencer.mak
+	make -f rex_onig.mak
 
 test:
 	make -f rex_pcre.mak test
 	make -f rex_spencer.mak test
+	make -f rex_onig.mak test
 
 install:
 	make -f rex_pcre.mak install
 	make -f rex_spencer.mak install
+	make -f rex_onig.mak install
 
 clean:
 	make -f rex_pcre.mak clean
 	make -f rex_spencer.mak clean
+	make -f rex_onig.mak clean
 
 
 .PHONY: all build test install clean
diff --git a/windows/mingw/rex_onig.mak b/windows/mingw/rex_onig.mak
new file mode 100755
index 0000000..1e3e2a0
--- /dev/null
+++ b/windows/mingw/rex_onig.mak
@@ -0,0 +1,35 @@
+# Project: rex_onig
+
+# User Settings ------------------------------------------------------------
+# path of Lua include files
+LUAINC = s:\progr\work\system\include
+
+# path of Oniguruma include files
+REGEXINC = s:\progr\work\system\include
+
+# path of Lua DLL and onig.dll
+DLLPATH = c:\exe
+
+# name of Lua DLL to link to (.dll should be omitted)
+LUADLL = lua5.1
+
+# path to install rex_onig.dll
+INSTALLPATH = s:\exe\lib\lua\5.1
+# --------------------------------------------------------------------------
+
+PROJECT     = rex_onig
+MYINCS      = -I$(REGEXINC) -I$(LUAINC) 
+MYLIBS      = -L$(DLLPATH) -lonig -l$(LUADLL) -Wl,--enable-auto-import
+OBJ         = lonig.o lonig_f.o common.o
+MYCFLAGS    = -W -Wall -O2
+EXPORTED    = 'luaopen_$(PROJECT)'
+SRCPATH     = ..\..\src;..\..\src\oniguruma
+TESTPATH    = ..\..\test
+TESTNAME    = onig
+
+include _mingw.mak
+
+lonig.o   : common.h algo.h
+lonig_f.o : common.h
+common.o  : common.h
+
diff --git a/windows/mingw/rex_pcre.mak b/windows/mingw/rex_pcre.mak
index 862b6b7..0c334d3 100755
--- a/windows/mingw/rex_pcre.mak
+++ b/windows/mingw/rex_pcre.mak
@@ -23,7 +23,7 @@ MYLIBS      = -L$(DLLPATH) -lpcre -l$(LUADLL)
 OBJ         = lpcre.o lpcre_f.o common.o
 MYCFLAGS    = -W -Wall -O2
 EXPORTED    = 'luaopen_$(PROJECT)'
-SRCPATH     = ..\..\src
+SRCPATH     = ..\..\src;..\..\src\pcre
 TESTPATH    = ..\..\test
 TESTNAME    = pcre
 
diff --git a/windows/mingw/rex_spencer.mak b/windows/mingw/rex_spencer.mak
index 736bbc1..5a9f4f2 100755
--- a/windows/mingw/rex_spencer.mak
+++ b/windows/mingw/rex_spencer.mak
@@ -23,7 +23,7 @@ MYLIBS      = -L$(DLLPATH) -lrxspencer -l$(LUADLL)
 OBJ         = lposix.o common.o
 MYCFLAGS    = -W -Wall -O2
 EXPORTED    = 'luaopen_$(PROJECT)'
-SRCPATH     = ..\..\src
+SRCPATH     = ..\..\src;..\..\src\posix
 TESTPATH    = ..\..\test
 TESTNAME    = spencer