repaired some of the more obvious horrors in the contrib (configure) Makefiles

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index a612e94d95fb733cd5bbd15ca2ee94e2c6ccdbd2..fec3d1afce54fb6112acf666b5051b31b0e8eaa3 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -2,7 +2,8 @@
 
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
-LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
+# 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
@@ -13,6 +14,7 @@ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 # versions of C++ Builder.
 !ifndef LINK
 LINK=ilink32
+#LINK=tlink32
 !endif
 
 !ifndef FINAL
@@ -45,7 +47,7 @@ WXLIB= $(WXLIBDIR)\wx200.lib
 
 !else
 
-LINK_FLAGS= /Tpe /ap /c
+LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1
@@ -59,7 +61,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 
 !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)