Index: third_party/libxml/src/win32/Makefile.msvc |
diff --git a/third_party/libxml/src/win32/Makefile.msvc b/third_party/libxml/src/win32/Makefile.msvc |
index 253c46ebd3ee0c2496f6a94cb185ef4411546c49..d16c1a2d51b0a5d7b094432deff8f83cae05d49e 100644 |
--- a/third_party/libxml/src/win32/Makefile.msvc |
+++ b/third_party/libxml/src/win32/Makefile.msvc |
@@ -36,14 +36,14 @@ UTILS_INTDIR = int.utils.msvc |
# The preprocessor and its options. |
CPP = cl.exe /EP |
-CPPFLAGS = /nologo /I$(XML_SRCDIR)\include |
+CPPFLAGS = /nologo /I$(XML_SRCDIR)\include /D "NOLIBTOOL" |
!if "$(WITH_THREADS)" != "no" |
CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" |
!endif |
# The compiler and its options. |
CC = cl.exe |
-CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME) |
+CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) |
CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) |
!if "$(WITH_THREADS)" != "no" |
CFLAGS = $(CFLAGS) /D "_REENTRANT" |
@@ -58,6 +58,9 @@ CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" |
!if "$(WITH_ZLIB)" == "1" |
CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H" |
!endif |
+!if "$(WITH_LZMA)" == "1" |
+CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" |
+!endif |
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE |
# The linker and its options. |
@@ -75,7 +78,12 @@ LIBS = $(LIBS) iconv.lib |
LIBS = $(LIBS) icu.lib |
!endif |
!if "$(WITH_ZLIB)" == "1" |
-LIBS = $(LIBS) zdll.lib |
+# could be named differently zdll or zlib |
+# LIBS = $(LIBS) zdll.lib |
+LIBS = $(LIBS) zlib.lib |
+!endif |
+!if "$(WITH_LZMA)" == "1" |
+LIBS = $(LIBS) liblzma.lib |
!endif |
!if "$(WITH_THREADS)" == "posix" |
LIBS = $(LIBS) pthreadVC.lib |
@@ -94,11 +102,14 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 |
LDFLAGS = $(LDFLAGS) /DEBUG |
!else |
CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 |
-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 |
+# commented out as this break VC10 c.f. 634846 |
+# LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 |
+LDFLAGS = $(LDFLAGS) |
!endif |
# Libxml object files. |
-XML_OBJS = $(XML_INTDIR)\c14n.obj\ |
+XML_OBJS = $(XML_INTDIR)\buf.obj\ |
+ $(XML_INTDIR)\c14n.obj\ |
$(XML_INTDIR)\catalog.obj\ |
$(XML_INTDIR)\chvalid.obj\ |
$(XML_INTDIR)\debugXML.obj\ |
@@ -143,7 +154,8 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ |
$(XML_INTDIR)\xmlstring.obj |
# Static libxml object files. |
-XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ |
+XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ |
+ $(XML_INTDIR_A)\c14n.obj\ |
$(XML_INTDIR_A)\catalog.obj\ |
$(XML_INTDIR_A)\chvalid.obj\ |
$(XML_INTDIR_A)\debugXML.obj\ |
@@ -188,7 +200,8 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ |
$(XML_INTDIR_A)\xmlstring.obj |
# Static libxml object files. |
-XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\c14n.obj\ |
+XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\ |
+ $(XML_INTDIR_A_DLL)\c14n.obj\ |
$(XML_INTDIR_A_DLL)\catalog.obj\ |
$(XML_INTDIR_A_DLL)\chvalid.obj\ |
$(XML_INTDIR_A_DLL)\debugXML.obj\ |
@@ -249,7 +262,9 @@ UTILS = $(BINDIR)\xmllint.exe\ |
$(BINDIR)\testXPath.exe\ |
$(BINDIR)\runtest.exe\ |
$(BINDIR)\runsuite.exe\ |
- $(BINDIR)\testapi.exe |
+ $(BINDIR)\testapi.exe\ |
+ $(BINDIR)\testlimits.exe\ |
+ $(BINDIR)\testrecurse.exe |
!if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" |
UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe |
@@ -289,11 +304,12 @@ distclean : clean |
rebuild : clean all |
install-libs : all |
- if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml |
+ if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2 |
+ if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml |
if not exist $(BINPREFIX) mkdir $(BINPREFIX) |
if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) |
if not exist $(SOPREFIX) mkdir $(SOPREFIX) |
- copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml |
+ copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml |
copy $(BINDIR)\$(XML_SO) $(SOPREFIX) |
copy $(BINDIR)\$(XML_A) $(LIBPREFIX) |
copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX) |
@@ -401,7 +417,15 @@ $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla libxmladll |
# TESTS |
-tests : XPathtests |
+tests : checktests XPathtests |
+ |
+checktests : $(UTILS) |
+ cd .. && win32\$(BINDIR)\runtest.exe |
+ cd .. && win32\$(BINDIR)\testrecurse.exe |
+ cd .. && win32\$(BINDIR)\testapi.exe |
+ cd .. && win32\$(BINDIR)\testchar.exe |
+ cd .. && win32\$(BINDIR)\testdict.exe |
+ cd .. && win32\$(BINDIR)\runxmlconf.exe |
XPathtests : $(BINDIR)\testXPath.exe |
@echo. 2> .memdump |