Michael Fieldings patch 598106 applied in part

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

distrib/msw/tmake/b32.t

@@ -179,7 +179,7 @@ $(ARCHINCDIR)\wx:
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-	tlib "$(LIBTARGET)" /P1024 @&&!
+    tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
@@ -187,15 +187,15 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
     -erase $(LIBTARGET)
-	-erase $(WXLIBDIR)\wx.dll
+    -erase $(WXDLL)
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
+        $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
 c0d32.obj $(OBJECTS)
-$(WXLIBDIR)\wx
+$(WXDLL)
 nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+        implib -c $(LIBTARGET) $(WXDLL)
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -657,4 +657,3 @@ self:
     cd $(WXWIN)\distrib\msw\tmake
     tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
     copy makefile.$(MFTYPE) $(WXWIN)\src\msw
-

src/makeb32.env

@@ -36,12 +36,14 @@ LINK=ilink32
 FINAL=0
 !endif
 
-!if "$(FINAL)" == "0"
+!if "$(FINAL)" == "1"
-OPT = -Od
-DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE
-!else
 OPT = -O2
 DEBUG_FLAGS = -DUSE_DEFINE
+LINKDEBUGFLAGS=
+!else
+OPT = -Od
+DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE
+LINKDEBUGFLAGS=/v
 !endif
 
 !ifndef DLL
@@ -56,20 +58,57 @@ DLL=0
 # DLL use wxWin STATIC   0                 0               1
 #
 
+# Determine the library name depending on the options, to allow
+# multiple versions to coexist.
+# Note that the clean target will only delete the appropriate .lib for the current
+# options and all the obj files, and note that you must delete the obj files if you
+# change the options so that they are compiled using the correct ones.
+
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+WXLIBNAME=wx32
+!else
+WXLIBNAME=wx32
+!endif
+
+!if "$(UNICODE)" == "1"
+WXLIBNAME=$(WXLIBNAME)u
+!endif
+
+!if "$(FINAL)" == "1"
+WXLIBNAME=$(WXLIBNAME)$(FINAL)
+!else if "$(FINAL)" == "hybrid"
+WXLIBNAME=$(WXLIBNAME)h
+!else
+guilibsdll= oldnames.lib kernel32.lib \
+  ws2_32.lib mswsock.lib advapi32.lib user32.lib \
+  gdi32.lib comdlg32.lib winspool.lib
+WXLIBNAME=$(WXLIBNAME)d
+!endif
+
+!if "$(wxUSE_GUI)" == "0"
+WXLIBNAME=$(WXLIBNAME)b
+CPPFLAGS=-DwxUSE_GUI=0
+!endif
+
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+INCEXT=dll$(INCEXT)
+!endif
+
+!ifndef WXLIBDIR
+WXLIBDIR=$(WXDIR)\lib
+!endif
+
+WXLIB=$(WXLIBDIR)\$(WXLIBNAME).lib
+WXDLL=$(WXLIBDIR)\$(WXLIBNAME).dll
+
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx233.lib
-
 !else
 
-LINK_FLAGS= /aa /c
-
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx233.lib
 !else
 DLL_FLAGS=
-WXLIB= $(WXLIBDIR)\wx32.lib
 !endif
 
 !endif
@@ -78,7 +117,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
+CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 DUMMY=dummy
 

src/msw/makefile.b32

@@ -404,7 +404,7 @@ $(ARCHINCDIR)\wx:
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-	tlib "$(LIBTARGET)" /P1024 @&&!
+    tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
@@ -412,15 +412,15 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
     -erase $(LIBTARGET)
-	-erase $(WXLIBDIR)\wx.dll
+    -erase $(WXDLL)
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
+        $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
 c0d32.obj $(OBJECTS)
-$(WXLIBDIR)\wx
+$(WXDLL)
 nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
-        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+        implib -c $(LIBTARGET) $(WXDLL)
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -1428,4 +1428,3 @@ self:
     cd $(WXWIN)\distrib\msw\tmake
     tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
     copy makefile.$(MFTYPE) $(WXWIN)\src\msw
-