From 3130b11f24005f76a61a4b781991d2dc3cb6530e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 6 Aug 2004 09:38:36 +0000 Subject: [PATCH] Updates for new objects in NMAKE makefile --- win/makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/win/makefile b/win/makefile index f60ba1f..b104784 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.25 2003-11-29 16:47:58 adam Exp $ +# $Id: makefile,v 1.26 2004-08-06 09:38:36 adam Exp $ ########################################################### ############### Parameters @@ -13,7 +13,7 @@ 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.4 +YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22 YAZINCL=$(YAZDIR)\include YAZLIB=$(YAZDIR)\lib\yaz.lib YAZLIBS=$(YAZLIB) @@ -262,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 \ @@ -288,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 \ -- 1.7.10.4