--- /Source/svn_maint/OpenSource/libxml2/libxml2-2.7.3/win32/Makefile.msvc	2014-05-20 13:21:39 +0000
+++ /Source/sandbox/OpenSource/libxml2/win32/Makefile.msvc	2014-05-20 15:33:21 +0000
@@ -21,11 +21,18 @@
 # Names of various input and output components.
 XML_NAME = xml2
 XML_BASENAME = lib$(XML_NAME)
+!if "$(XML_TOOLSET)" != ""
+XML_SO = $(XML_BASENAME)-$(XML_TOOLSET).dll
+XML_IMP = $(XML_BASENAME)-$(XML_TOOLSET).lib
+XML_A = $(XML_BASENAME)-$(XML_TOOLSET)_a.lib
+XML_A_DLL = $(XML_BASENAME)-$(XML_TOOLSET)_a_dll.lib
+!else
 XML_SO = $(XML_BASENAME).dll
 XML_IMP = $(XML_BASENAME).lib
-XML_DEF = $(XML_BASENAME).def
 XML_A = $(XML_BASENAME)_a.lib
 XML_A_DLL = $(XML_BASENAME)_a_dll.lib
+!endif
+XML_DEF = $(XML_BASENAME).def
 
 # Place where we let the compiler put its output.
 BINDIR = bin.msvc
@@ -91,7 +98,7 @@
 LDFLAGS = $(LDFLAGS) /DEBUG
 !else
 CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+LDFLAGS = $(LDFLAGS)
 !endif
 
 # Libxml object files.
@@ -262,7 +269,7 @@
 _VC_MANIFEST_EMBED_DLL=
 !endif
 
-all : libxml libxmla libxmladll utils
+all : libxml libxmla libxmladll
 
 libxml : $(BINDIR)\$(XML_SO)