forgot to uncomment a few things

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 8e318d05368b0c62870840081e8b2dba0e6cd4c9..16f2b3f4693addd79d67dc209292a4cb6ebc9900 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -3,9 +3,12 @@
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include
+WXINC = $(WXDIR)\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 
+# This should be changed to ilink32 for C++Builder 4 and above
+LINK=tlink32
+
 !ifndef FINAL
 FINAL=0
 !endif
@@ -50,16 +53,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 {$< }