Restored sane way of using BC++ linker

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makeb32.env b/src/makeb32.env
index b41cd100faa46aae95fe189e59c7f906b028d198..fec3d1afce54fb6112acf666b5051b31b0e8eaa3 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -47,7 +47,7 @@ WXLIB= $(WXLIBDIR)\wx200.lib
 
 !else
 
-LINK_FLAGS= /Tpe /ap /c
+LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1
@@ -61,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)

diff --git a/src/makeg95.env b/src/makeg95.env
index 90614fde8c382484bf3f764c72ca6f0476b6535c..a87b513ddfd2430094766b2669b0842528afd5b7 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -12,7 +12,7 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
-MINGW32=0
+MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index fcf800ede934825ddf5c9a0c92e3b7b924c4d791..df95b0e0db9cc9f4a892826789b1f495bd508b50 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -20,12 +20,12 @@ LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odb
 
 !if "$(FINAL)" == "0"
 #LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=/v /c /Tpe -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c /aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 #LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
-LINKFLAGS=/Tpe -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/aa -L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS =
 !endif