no more _ftime instead of ftime

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index ab253615c5450d5112c81d0efec53733ec36768c..145d7e611e9604458ae4851ae6b63ebc0d496da8 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -3,9 +3,13 @@
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 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__
 
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 

+# This should be changed to ilink32 for C++Builder 4 and above
+LINK=tlink32
+

 !ifndef FINAL
 FINAL=0
 !endif
 !ifndef FINAL
 FINAL=0
 !endif


@@ -60,6 +64,8 @@ DUMMY=dummy
 SRCSUFF = cpp
 OBJSUFF = obj
 
 SRCSUFF = cpp
 OBJSUFF = obj
 

+WAITFLAG = /w
+

 .$(SRCSUFF).obj:
        bcc32 $(CPPFLAGS) -c {$< }
 
 .$(SRCSUFF).obj:
        bcc32 $(CPPFLAGS) -c {$< }