X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=74bd2b63cd3ede310b74bebae8b681499584c509;hb=ffb6aaba033b87c9e2e4d32e1f84f88bc6679e1f;hp=4c9e6518823a82baf3b9b496b1ee711071526360;hpb=586b0ab50d888a68ce844c4b7d196e9c23e1afbd;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 4c9e651..74bd2b6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.19 2002-11-26 22:04:13 adam Exp $
+# $Id: makefile,v 1.21 2003-02-23 22:52:15 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -12,8 +12,8 @@ HAVE_EXPAT=1
 EXPAT_DIR= c:\Expat-1.95.4
 
 # iconv is optional
-HAVE_ICONV=0
-ICONV_DIR = c:\libiconv-1.7.0.1
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.8.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
+YAZDIR=$(ROOTDIR)\..\YAZ-2.0
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -35,8 +35,6 @@ YAZBINDIR=$(YAZDIR)\bin
 YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
 YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
 
-DEFAULT_PROFILE_PATH=0
-
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
 # (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
 
@@ -127,6 +125,7 @@ COMMON_C_OPTIONS=          \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
+  /DDEFAULT_PROFILE_PATH=0 \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -308,7 +307,8 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_sutrs.obj \
 	$(OBJDIR)\d1_tagset.obj \
 	$(OBJDIR)\d1_varset.obj \
-	$(OBJDIR)\d1_write.obj
+	$(OBJDIR)\d1_write.obj \
+	$(OBJDIR)\xpath.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \