Index: Makefile.msvc =================================================================== --- Makefile.msvc (revision 1470) +++ Makefile.msvc (working copy) @@ -58,7 +58,7 @@ LD = link.exe LDFLAGS = /nologo LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) -LIBS = wsock32.lib +LIBS = # The archiver and its options. AR = lib.exe @@ -222,7 +222,7 @@ # An implicit rule for static libxslt compilation. {$(XSLT_SRCDIR)}.c{$(XSLT_INTDIR_A)}.obj:: - $(CC) $(CFLAGS) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" \ + $(CC) $(CFLAGS) /D "LIBXSLT_STATIC" \ /Fo$(XSLT_INTDIR_A)\ /c $< # Compiles libxslt source. Uses the implicit rule for commands. @@ -268,7 +268,7 @@ # An implicit rule for static libexslt compilation. {$(EXSLT_SRCDIR)}.c{$(EXSLT_INTDIR_A)}.obj:: - $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ + $(CC) /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ /I$(EXSLT_SRCDIR) $(CFLAGS) /Fo$(EXSLT_INTDIR_A)\ /c $< # Compiles libxslt source. Uses the implicit rule for commands. @@ -307,7 +307,7 @@ # An implicit rule for xsltproc and friends. APPLIBS = $(LIBS) !if "$(STATIC)" == "1" -APPLIBS = $(LIBS) libxml2_a.lib +APPLIBS = $(LIBS) libxml2.lib !if "$(WITH_ICONV)" == "1" APPLIBS = $(APPLIBS) iconv.lib !endif @@ -315,7 +315,7 @@ APPLIBS = $(APPLIBS) zlib.lib !endif {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ + $(CC) /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< $(LD) $(LDFLAGS) /OUT:$@ $(XSLT_A) $(EXSLT_A) $(APPLIBS) $(UTILS_INTDIR)\$(