Check for NULL before dereferencing

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index dd0cf6467f3bfc619c3daa84965b23a08414a7b0..89cfffc358ecbe57b2bb6b26df2ce5fb48cf9ea4 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -1,12 +1,26 @@
 # 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)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg

+
+BCCDIR=$(MAKEDIR)\..
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4
+!endif
+
+ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
+

 # Using a config file isn't compatible across all BC++ versions
 # LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib
 # 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
 
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
 


@@ -44,7 +58,7 @@ DLL=0
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL

-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib

 
 !else
 
 
 !else
 


@@ -52,7 +66,7 @@ LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL

-WXLIB= $(WXLIBDIR)\wx232.lib
+WXLIB= $(WXLIBDIR)\wx233.lib

 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib