X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbf656555e872684a74eb0badffe1aa33bedf95d..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/src/makeb32.env diff --git a/src/makeb32.env b/src/makeb32.env index dd0cf6467f..ac8e8f925f 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 @@ -44,7 +48,7 @@ DLL=0 !if "$(WXMAKINGDLL)" == "1" DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx232.lib +WXLIB= $(WXLIBDIR)\wx233.lib !else @@ -52,7 +56,7 @@ LINK_FLAGS= /aa /c !if "$(WXUSINGDLL)" == "1" DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL -WXLIB= $(WXLIBDIR)\wx232.lib +WXLIB= $(WXLIBDIR)\wx233.lib !else DLL_FLAGS= WXLIB= $(WXLIBDIR)\wx32.lib