X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b2ea8df05b03885e93d543ef1e7cf33711e49e41;hb=3fbd2beb5c41de39604f27b39a9461335b2b176b;hp=76185774957dcd3ebe5d8c9d90b98fd78a4d7d03;hpb=e57a1c65b9630e5b93d254519090bd0875c1d3c9;p=idzebra-moved-to-github.git diff --git a/win/makefile b/win/makefile index 7618577..b2ea8df 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.58 2006-10-05 13:19:10 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 \ @@ -353,6 +354,7 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\dirs.obj \ $(OBJDIR)\dopen.obj \ $(OBJDIR)\drdwr.obj \ + $(OBJDIR)\exit.obj \ $(OBJDIR)\extract.obj \ $(OBJDIR)\flock.obj \ $(OBJDIR)\imalloc.obj \ @@ -362,8 +364,10 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\isamb.obj \ $(OBJDIR)\isamc.obj \ $(OBJDIR)\isams.obj \ - $(OBJDIR)\kcompare.obj \ + $(OBJDIR)\isam_methods.obj \ + $(OBJDIR)\it_key.obj \ $(OBJDIR)\kcontrol.obj \ + $(OBJDIR)\key_block.obj \ $(OBJDIR)\kinput.obj \ $(OBJDIR)\limit.obj \ $(OBJDIR)\lookgrep.obj \ @@ -408,6 +412,7 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\sortidx.obj \ $(OBJDIR)\states.obj \ $(OBJDIR)\stream.obj \ + $(OBJDIR)\su_codec.obj \ $(OBJDIR)\symtab.obj \ $(OBJDIR)\trunc.obj \ $(OBJDIR)\untrans.obj \