From: George Tasker <gtasker@allenbrook.com>
Date: Sun, 12 Aug 2001 23:49:18 +0000 (+0000)
Subject: Added regex to WXINC line (patch from Markus G)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3b50432abf11a0dbdab6b8d4136c3956ce4def1f

Added regex to WXINC line (patch from Markus G)
Added definition of RM for use in makefiles so that 'erase' can be overridden with a different file deletion program (like 'rm')


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/makeb32.env b/src/makeb32.env
index dd0cf6467f..e6a4ba6b93 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -1,12 +1,16 @@
 # 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