diff options
Diffstat (limited to 'win32/Makefile.msvc')
| -rw-r--r-- | win32/Makefile.msvc | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index cc93372..d16c1a2 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -43,7 +43,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" # The compiler and its options. CC = cl.exe -CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /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" @@ -108,7 +108,8 @@ 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\ @@ -153,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\ @@ -198,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\ @@ -259,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 @@ -299,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) @@ -411,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 |