X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=b104784210b3c7b18cb5766e23e00ed68badea1c;hb=3130b11f24005f76a61a4b781991d2dc3cb6530e;hp=74bd2b63cd3ede310b74bebae8b681499584c509;hpb=ffb6aaba033b87c9e2e4d32e1f84f88bc6679e1f;p=idzebra-moved-to-github.git diff --git a/win/makefile b/win/makefile index 74bd2b6..b104784 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.21 2003-02-23 22:52:15 adam Exp $ +# $Id: makefile,v 1.26 2004-08-06 09:38:36 adam Exp $ ########################################################### ############### Parameters @@ -9,11 +9,11 @@ DEBUG=0 # 0 for release, 1 for debug # EXPAT is optional. It's required for grs.xml-filters. HAVE_EXPAT=1 -EXPAT_DIR= c:\Expat-1.95.4 +EXPAT_DIR= c:\Expat-1.95.7 # iconv is optional HAVE_ICONV=1 -ICONV_DIR = c:\iconv-1.8.win32 +ICONV_DIR = c:\iconv-1.9.1.win32 default: all @@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex ROOTDIR=.. # The home of zebra # YAZ include files, libraries, etc. -YAZDIR=$(ROOTDIR)\..\YAZ-2.0 +YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22 YAZINCL=$(YAZDIR)\include YAZLIB=$(YAZDIR)\lib\yaz.lib YAZLIBS=$(YAZLIB) @@ -246,10 +246,14 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\lookup.obj \ $(OBJDIR)\lookupec.obj \ $(OBJDIR)\marcread.obj \ + $(OBJDIR)\marcomp.obj \ + $(OBJDIR)\inline.obj \ $(OBJDIR)\mfile.obj \ $(OBJDIR)\open.obj \ $(OBJDIR)\passwddb.obj \ + $(OBJDIR)\zvrank.obj \ $(OBJDIR)\rank1.obj \ + $(OBJDIR)\livcode.obj \ $(OBJDIR)\readfile.obj \ $(OBJDIR)\recctrl.obj \ $(OBJDIR)\recgrs.obj \ @@ -258,6 +262,7 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\rectext.obj \ $(OBJDIR)\regxread.obj \ $(OBJDIR)\xmlread.obj \ + $(OBJDIR)\danbibr.obj \ $(OBJDIR)\res.obj \ $(OBJDIR)\retrieve.obj \ $(OBJDIR)\rsbool.obj \ @@ -284,6 +289,7 @@ ZEBRALIB_OBJS= \ $(OBJDIR)\rsisamd.obj \ $(OBJDIR)\rsisamb.obj \ $(OBJDIR)\rsbetween.obj \ + $(OBJDIR)\rsprox.obj \ $(OBJDIR)\dir.obj \ $(OBJDIR)\dirs.obj \ $(OBJDIR)\extract.obj \