# Common settings for Borland 32-bit compilation (makefile.b32 files)
+!if "$(RM)" == ""
+RM= erase
+!endif
+
WXDIR = $(WXWIN)
CFG = $(WXDIR)\src\msw\wxwin32.cfg
# Using a config file isn't compatible across all BC++ versions
# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib
-WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex;
WIN95FLAG = -D__WIN95__ -D__WINDOWS__
+RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
# This should be changed to tlink32 if ilink32 is not available.
# Ilink32 is available on BC++ 5.02 and above, and all
!if "$(WXMAKINGDLL)" == "1"
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib
!else
!if "$(WXUSINGDLL)" == "1"
DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib