summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-11-16 20:54:36 -0800
committerPixel <pixel@nobis-crew.org>2011-11-16 20:56:15 -0800
commit0c4f27688622053a35d5b14ad138a6cd0fba20c4 (patch)
treebe626a776ad031b880dc751de129b712e234ff1c /Makefile
parent8ed05c55f14823b4f8782d3f096803c1d3f27d3a (diff)
Adding the Regex class.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7bf52ba..e836703 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ ifeq ($(SYSTEM),MINGW32)
BINEXT = exe
COMPILE_PTHREADS = true
CONFIG_H = mingw32-config.h
- INCLUDES += win32/iconv win32/pthreads-win32
+ INCLUDES += win32/iconv win32/pthreads-win32 win32/regex
LIBS += ws2_32
ifeq ($(TRUESYSTEM),Linux)
ifeq ($(DISTRIB),CentOS)
@@ -107,7 +107,7 @@ LDFLAGS += $(ARCH_FLAGS)
LDLIBS = $(addprefix -l, $(LIBS))
vpath %.cc src:tests
-vpath %.c libcoro:libeio:libev:win32/pthreads-win32:win32/iconv
+vpath %.c libcoro:libeio:libev:win32/pthreads-win32:win32/iconv:win32/regex
BALAU_SOURCES = \
Local.cc \
@@ -130,6 +130,8 @@ TaskMan.cc \
HttpServer.cc \
\
BLua.cc \
+\
+BRegex.cc \
ifeq ($(SYSTEM),MINGW32)
WIN32_SOURCES = \
@@ -137,6 +139,7 @@ pthread.c \
iconv.c \
localcharset.c \
relocatable.c \
+msvc-regex.c \
endif
@@ -167,6 +170,7 @@ test-Threads.cc \
test-Handles.cc \
test-Sockets.cc \
test-Lua.cc \
+test-Regex.cc \
LIB = libBalau.a