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
This commit is contained in:
George Tasker
2001-08-12 23:49:18 +00:00
parent b9f246f7d9
commit 3b50432abf

View File

@@ -1,12 +1,16 @@
# Common settings for Borland 32-bit compilation (makefile.b32 files) # Common settings for Borland 32-bit compilation (makefile.b32 files)
!if "$(RM)" == ""
RM= erase
!endif
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
CFG = $(WXDIR)\src\msw\wxwin32.cfg CFG = $(WXDIR)\src\msw\wxwin32.cfg
# Using a config file isn't compatible across all BC++ versions # Using a config file isn't compatible across all BC++ versions
# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\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__ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src