X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b2ea8df05b03885e93d543ef1e7cf33711e49e41;hb=3fbd2beb5c41de39604f27b39a9461335b2b176b;hp=aa117c6a8de6b47648d47c6725a5018fc143ad36;hpb=9a3756e232c5891f08e9bf36a41c44e9bbf3ef5a;p=idzebra-moved-to-github.git diff --git a/win/makefile b/win/makefile index aa117c6..b2ea8df 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.60 2006-11-24 19:48:23 adam Exp $ +# $Id: makefile,v 1.62 2006-12-15 21:11:37 adam Exp $ ########################################################### ############### Parameters @@ -159,7 +159,7 @@ iconv: !if $(HAVE_LIBXML2) LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib" -LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include" +LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include" libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll $(BINDIR)\libxml2.dll: @@ -321,6 +321,7 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\bfile.obj \ $(OBJDIR)\bset.obj \ $(OBJDIR)\cfile.obj \ + $(OBJDIR)\check_res.obj \ $(OBJDIR)\charmap.obj \ $(OBJDIR)\close.obj \ $(OBJDIR)\commit.obj \