makefiles for stc lib and sample for Unix

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 145d7e611e9604458ae4851ae6b63ebc0d496da8..a612e94d95fb733cd5bbd15ca2ee94e2c6ccdbd2 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -2,13 +2,18 @@
 
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
+LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 
-# This should be changed to ilink32 for C++Builder 4 and above
-LINK=tlink32
+# 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
+!endif
 
 !ifndef FINAL
 FINAL=0