X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c740f49634629e47738ea73a199ea1a97640dc53..8290d43d0d43369d007f1c47abf98a45da461a30:/src/makeb32.env?ds=sidebyside

diff --git a/src/makeb32.env b/src/makeb32.env
index 8e318d0536..3c90826c45 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -3,9 +3,14 @@
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include
+WXLIBDIR2 = $(WXDIR)\contrib\lib
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 
+# This should be changed to tlink32 if ilink32 is not available
+# Available on C++ 5.02 and above
+LINK=ilink32
+
 !ifndef FINAL
 FINAL=0
 !endif
@@ -50,16 +55,18 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 
 !if "$(WXBUILDDLL)" == "1"
 DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
-LINK_FLAGS= /Tpd /ap /c
+LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
 !endif
 
-CPPFLAGS=$(DLL_FLAGS) @$(CFG)
+CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 DUMMY=dummy
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
+WAITFLAG = /w
+
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }