X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b14391d1c8fde767eabedd2243dd6583f685f53f..7a944d2fd2324ca7886d36fd3f4d7a174afdff3a:/src/makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 145d7e611e..89cfffc358 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -1,14 +1,36 @@
 # Common settings for Borland 32-bit compilation (makefile.b32 files)
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 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
-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__
-
-# This should be changed to ilink32 for C++Builder 4 and above
-LINK=tlink32
+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
+# versions of C++ Builder.
+!ifndef LINK
+LINK=ilink32
+#LINK=tlink32
+!endif
 
 !ifndef FINAL
 FINAL=0
@@ -35,16 +57,16 @@ DLL=0
 #
 
 !if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx233.lib
 
 !else
 
-LINK_FLAGS= /Tpe /ap /c
+LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx233.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
@@ -53,8 +75,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 !endif
 
 !if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
-LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
+LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
 CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)